[Remoterengine-commits] r154 - pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server

[noreply at r-forge.r-project.org]

Author: ian_long
Date: 2009-09-18 07:18:13 +0200 (Fri, 18 Sep 2009)
New Revision: 154

Modified:
   pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/REngineServer.java
Log:
Prevented NullPointerException if server doesn't start up correctly

Modified: pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/REngineServer.java
===================================================================
--- pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/REngineServer.java	2009-09-18 05:16:07 UTC (rev 153)
+++ pkg/RemoteREngine/inst/java_src/src/server/org/rosuda/REngine/remote/server/REngineServer.java	2009-09-18 05:18:13 UTC (rev 154)
@@ -120,7 +120,11 @@
     		}
     	}
     	
-    	engine.startConsoleThread(); 
+    	if (engine != null) {
+    		engine.startConsoleThread();
+    	} else {
+    		System.err.println("Null RemoteREngine_Server returned from startup.");
+    	}
     	
 	}