Merge lp:~yrke/tapaal/memoryMonitor-nullpointer into lp:tapaal

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/util/MemoryMonitor.java'
--- src/dk/aau/cs/util/MemoryMonitor.java	2020-08-10 07:11:17 +0000
+++ src/dk/aau/cs/util/MemoryMonitor.java	2020-08-24 14:21:21 +0000
@@ -80,11 +80,14 @@
 			}else{
 				try {
 					Process p = Runtime.getRuntime().exec("ps -p "+PID+" -o rss"); 
-					BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream())); 
-
-					input.readLine(); //Actual memory usage is second line output
-                    String s = input.readLine();
-					memory = Double.parseDouble(s.replace(" ", ""))/1024;
+					BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+
+                    String s = input.readLine(); //Actual memory usage is second line output
+                    s = input.readLine();
+
+                    if (s!=null) { //Not sure why s would be null, but it seems to happen some time on MacOS
+                        memory = Double.parseDouble(s.replace(" ", "")) / 1024;
+                    }
 				} catch (IOException e) {
                     Logger.log(e);
 				}