svn commit: r1454770 - in /river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test: resources/qa1.logging share/LocatorsUtil.java

[peter_firmstone]

Author: peter_firmstone
Date: Sat Mar  9 23:22:47 2013
New Revision: 1454770

URL: http://svn.apache.org/r1454770
Log:
Fix NullPointerException in LocatorsUtil

Increase logging

Modified:
    
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
    
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/LocatorsUtil.java

Modified: 
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
URL: 
http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging?rev=1454770&r1=1454769&r2=1454770&view=diff
==============================================================================
--- 
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
 (original)
+++ 
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/resources/qa1.logging
 Sat Mar  9 23:22:47 2013
@@ -104,10 +104,10 @@ java.util.logging.FileHandler.level = IN
 #  FINEST (lowest value) 
 
 # For Everything
-sun.rmi.level = INFO
-net.jini.level = INFO
-org.apache.river.level = INFO
-com.sun.jini.level = INFO
+sun.rmi.level = FINE
+net.jini.level = FINE
+org.apache.river.level = FINE
+com.sun.jini.level = FINE
 
 # For the LogManager
 com.sun.jini.logging.LogManager.level = INFO

Modified: 
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/LocatorsUtil.java
URL: 
http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/LocatorsUtil.java?rev=1454770&r1=1454769&r2=1454770&view=diff
==============================================================================
--- 
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/LocatorsUtil.java
 (original)
+++ 
river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/share/LocatorsUtil.java
 Sat Mar  9 23:22:47 2013
@@ -204,7 +204,7 @@ public class LocatorsUtil {
                         logger.log(level, "locatorSet2["+j+"] = " +locator2);
                         logger.log(level, "");
                     }//endif
-                    if( locator2.equals(locator1) ) {
+                    if( locator2 != null && locator2.equals(locator1) ) {
                         hashSet2.remove(locator2);
                         break;
                     }