[Remoterengine-commits] r187 - pkg/RemoteREngine.test/inst/java_src/src/org/rosuda/REngine/remote/common

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

Author: ian_long
Date: 2009-09-26 06:11:08 +0200 (Sat, 26 Sep 2009)
New Revision: 187

Modified:
   pkg/RemoteREngine.test/inst/java_src/src/org/rosuda/REngine/remote/common/RemoteREngineTestBase.java
Log:
-- Removed EngineNotAvailableException - handled further up the execution stack now
-- Fixed NullPointerException within init() method

Modified: pkg/RemoteREngine.test/inst/java_src/src/org/rosuda/REngine/remote/common/RemoteREngineTestBase.java
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/src/org/rosuda/REngine/remote/common/RemoteREngineTestBase.java	2009-09-25 14:14:55 UTC (rev 186)
+++ pkg/RemoteREngine.test/inst/java_src/src/org/rosuda/REngine/remote/common/RemoteREngineTestBase.java	2009-09-26 04:11:08 UTC (rev 187)
@@ -3,7 +3,6 @@
 import java.util.Enumeration;
 import java.util.Properties;
 
-import org.rosuda.REngine.remote.client.EngineNotAvailableException;
 import org.rosuda.REngine.remote.client.RemoteREngine;
 import org.testng.annotations.BeforeSuite;
 
@@ -35,9 +34,8 @@
 
 	/**
 	 * Call init() to connect to an instance of the RemoteREngine
-	 * @throws EngineNotAvailableException
 	 */
-	protected RemoteREngineTestBase() throws EngineNotAvailableException {
+	protected RemoteREngineTestBase() {
 		super();
 		init();
 	}
@@ -45,12 +43,9 @@
 	/**
 	 * Create a connection to a running remote server
 	 * @return Reference to a remote engine
-	 * @throws EngineNotAvailableException Failed to connect to remote R engine
 	 */
-	@BeforeSuite
-	protected static RemoteREngine init() throws EngineNotAvailableException {
+	protected static RemoteREngine init() {
 
-		RemoteREngine r = null ;
 		String name = "RemoteREngineTest";
 		int registryPort = RemoteREngineConstants.RMIPORT;
 		try{