Author: peter_firmstone Date: Tue Mar 20 23:05:51 2012 New Revision: 1303195
URL: http://svn.apache.org/viewvc?rev=1303195&view=rev Log: Fixed bug in Reggie, when random number returns Integer.MIN_VALUE, then Maths.abs returns a negative number. Fixed a classpath issue in the qa suite, caused by separating reference collections. Modified: river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java Modified: river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties?rev=1303195&r1=1303194&r2=1303195&view=diff ============================================================================== --- river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties (original) +++ river/jtsk/trunk/qa/src/com/sun/jini/qa/resources/qaDefaults.properties Tue Mar 20 23:05:51 2012 @@ -132,7 +132,7 @@ net.jini.space.JavaSpace.preparername=te # For the shared activation group and its SharedGroupImpl # sharedGroup.type=group -sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar +sharedGroup.classpath=${com.sun.jini.jsk.home}$/lib$/sharedvm.jar$:${com.sun.jini.jsk.home}$/lib$/reference-collections-1.0.0.jar sharedGroup.starterConfiguration=<url:harness/configs/<config>/starter/starter.config> sharedGroup.policyfile=<url:harness/policy/defaultsharedvm.policy> sharedGroup.implPrefix=sharedGroupImpl Modified: river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java?rev=1303195&r1=1303194&r2=1303195&view=diff ============================================================================== --- river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java (original) +++ river/jtsk/trunk/src/com/sun/jini/reggie/RegistrarImpl.java Tue Mar 20 23:05:51 2012 @@ -4822,7 +4822,7 @@ class RegistrarImpl implements Registrar int slen = services.size(); if (slen == 0) return null; - int srand = Math.abs(random.nextInt()) % slen; + int srand = random.nextInt(Integer.MAX_VALUE) % slen; for (int i = 0; i < slen; i++) { SvcReg reg = (SvcReg)services.get((i + srand) % slen); if (reg.leaseExpiration > now && matchAttributes(tmpl, reg.item))
