Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NullPointerExceptions

Browse Source
This commit is contained in:
DaCoolX
2021-11-16 18:00:51 +01:00
parent 0d6ca83d26
commit 715acd2239
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/sheepit/client/Job.java
View File

@@ -134,7 +134,8 @@ import java.util.regex.Pattern;
} }
private OSProcess getRenderOSProcess() { private OSProcess getRenderOSProcess() {
return OS.operatingSystem.getProcess((int) getProcessRender().getProcess().pid()); Process proc = getProcessRender().getProcess();
return proc == null ? null : OS.operatingSystem.getProcess((int) proc.pid()); // Check for null otherwise proc.pid() will throw NullPointerEx
} }
public long getUsedMemory() { public long getUsedMemory() {
@@ -609,18 +610,20 @@ import java.util.regex.Pattern;
} }
private void updateRenderingMemoryPeak() { private void updateRenderingMemoryPeak() {
long mem = getUsedMemory(); if (getProcessRender().getProcess() != null && getRenderOSProcess() != null){
getProcessRender().setMemoryUsed(mem); long mem = getUsedMemory();
if (getProcessRender().getPeakMemoryUsed() < mem) { getProcessRender().setMemoryUsed(mem);
getProcessRender().setPeakMemoryUsed(mem); if (getProcessRender().getPeakMemoryUsed() < mem) {
getProcessRender().setPeakMemoryUsed(mem);
}
double memoryConsumed = getUsedMemory() / 1024.0;
double peakMemoryConsumed = getProcessRender().getPeakMemoryUsed() / 1024.0;
double totalUsedMemory = getTotalUsedMemory() / 1024.0;
double systemMemoryAvailable = OS.getOS().getFreeMemory() / 1024.0;
int threadCount = getThreadCount();
log.debug(String.format("RAM Consumed: %(,.2fMB | Peak RAM Consumed: %(,.2fMB | Virtual Mem Consumed: %(,.2fMB | System Available Memory: %(,.2fMB | Thread Count: %d",
memoryConsumed, peakMemoryConsumed, totalUsedMemory, systemMemoryAvailable, threadCount));
} }
double memoryConsumed = getUsedMemory() / 1024.0;
double peakMemoryConsumed = getProcessRender().getPeakMemoryUsed() / 1024.0;
double totalUsedMemory = getTotalUsedMemory() / 1024.0;
double systemMemoryAvailable = OS.getOS().getFreeMemory() / 1024.0;
int threadCount = getThreadCount();
log.debug(String.format("RAM Consumed: %(,.2fMB | Peak RAM Consumed: %(,.2fMB | Virtual Mem Consumed: %(,.2fMB | System Available Memory: %(,.2fMB | Thread Count: %d",
memoryConsumed, peakMemoryConsumed, totalUsedMemory, systemMemoryAvailable, threadCount));
} }
private Type detectError(String line) { private Type detectError(String line) {