You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2010/07/11 05:01:54 UTC

svn commit: r962973 - /incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java

Author: peter_firmstone
Date: Sun Jul 11 03:01:54 2010
New Revision: 962973

URL: http://svn.apache.org/viewvc?rev=962973&view=rev
Log:
River Refactoring.

LookupDiscoveryManager constructor with empty configuration,  has been changed to throw a ConfigurationException, this breaks compile time compatibility, but not binary compatiblity.  The reason the constructor was changed was to allow some private variables to be declared final and initialized in a constructor.

Modified:
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java?rev=962973&r1=962972&r2=962973&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java Sun Jul 11 03:01:54 2010
@@ -75,6 +75,7 @@ import net.jini.discovery.*;
 import com.sun.jini.reliableLog.ReliableLog;
 import com.sun.jini.reliableLog.LogException;
 import com.sun.jini.reliableLog.LogHandler;
+import net.jini.config.ConfigurationException;
 
 /**
  * The server side of an implementation of the lookup service.  Multiple
@@ -3936,8 +3937,13 @@ public class RegistrarImpl implements Re
 	    }
 	}
 	log.snapshot();
+        discoer = null;
+        try {
 	discoer = new LookupDiscoveryManager(lookupGroups, lookupLocators,
 					     null);
+        } catch (ConfigurationException e) {
+            throw new IOException("LookupDiscoveryManager constructor threw exeption", e);
+        }
 	joiner = new JoinManager(proxy, lookupAttrs, myServiceID,
 				 (DiscoveryListenerManagement) discoer, null);
 	/* start up all the daemon threads */