river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1571655 - in /river/jtsk/skunk/qa_refactor/trunk: qa/src/com/sun/jini/qa/resources/qaDefaults.properties src/com/sun/jini/reggie/RegistrarImpl.java
Date Tue, 25 Feb 2014 11:36:53 GMT
Author: peter_firmstone
Date: Tue Feb 25 11:36:53 2014
New Revision: 1571655

URL: http://svn.apache.org/r1571655
Log:
System property for Reggie, ensure it is actually visible to tests.  Also ensure that if property
is not set that Reggie throws the correct Exception, BindException during construction and
not NullPointerException.

Modified:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
    river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1571655&r1=1571654&r2=1571655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties
Tue Feb 25 11:36:53 2014
@@ -13,7 +13,6 @@ net.jini.core.lookup.ServiceRegistrar.po
 net.jini.core.lookup.ServiceRegistrar.log=reggie_log
 net.jini.core.lookup.ServiceRegistrar.membergroups=QATestDefaultGroup
 #net.jini.core.lookup.ServiceRegistrar.port=4160
-net.jini.core.lookup.ServiceRegistrar.portAbitraryIfInUse=true
 net.jini.core.lookup.ServiceRegistrar.serviceConfiguration=<url:harness/configs/<config>/reggie/reggie.config>
 net.jini.core.lookup.ServiceRegistrar.starterConfiguration=<url:harness/configs/<config>/starter/starter.config>
 net.jini.core.lookup.ServiceRegistrar.preparername=test.reggiePreparer
@@ -240,7 +239,8 @@ com.sun.jini.qa.harness.globalvmargs=\
 -Djava.security.properties=${com.sun.jini.qa.harness.securityproperties},\
 -Dcom.sun.jini.qa.harness.testhosts=${com.sun.jini.qa.harness.testhosts},\
 -Djava.util.logging.config.file=${java.util.logging.config.file},\
--Djava.rmi.server.useCodebaseOnly=false
+-Djava.rmi.server.useCodebaseOnly=false,\
+-Dnet.jini.core.lookup.ServiceRegistrar.portAbitraryIfInUse=true
 
 com.sun.jini.qa.harness.securityproperties=<url: harness/trust/dynamic-policy.properties>
 

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java?rev=1571655&r1=1571654&r2=1571655&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java Tue Feb
25 11:36:53 2014
@@ -2783,6 +2783,8 @@ class RegistrarImpl implements Registrar
                     if (arbitraryPort){
                         listen = reggie.serverSocketFactory.createServerSocket(0);
                         ephemeral = true;
+                    } else {
+                        throw e;
                     }
                 }
 	    }



Mime
View raw message