Author: sebb
Date: Mon Jan 21 01:32:09 2013
New Revision: 1436070

URL: http://svn.apache.org/viewvc?rev=1436070&view=rev
Log:
Value cannot be null (Eclipse)

Modified:
    
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java
    
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java
    
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java

Modified: 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java?rev=1436070&r1=1436069&r2=1436070&view=diff
==============================================================================
--- 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java
 (original)
+++ 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractKeyAnalyzer.java
 Mon Jan 21 01:32:09 2013
@@ -34,7 +34,7 @@ public abstract class AbstractKeyAnalyze
         if (o1 == null) {
             return o2 == null ? 0 : -1;
         } else if (o2 == null) {
-            return o1 == null ? 0 : 1;
+            return 1;
         }
         
         return ((Comparable<K>)o1).compareTo(o2);

Modified: 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java?rev=1436070&r1=1436069&r2=1436070&view=diff
==============================================================================
--- 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java
 (original)
+++ 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/AbstractTrie.java
 Mon Jan 21 01:32:09 2013
@@ -150,7 +150,7 @@ abstract class AbstractTrie<K, V> extend
         if (key == null) {
             return other == null;
         } else if (other == null) {
-            return key == null;
+            return false;
         }
         
         return keyAnalyzer.compare(key, other) == 0;

Modified: 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java?rev=1436070&r1=1436069&r2=1436070&view=diff
==============================================================================
--- 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java
 (original)
+++ 
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/ByteArrayKeyAnalyzer.java
 Mon Jan 21 01:32:09 2013
@@ -181,7 +181,7 @@ public class ByteArrayKeyAnalyzer extend
         if (o1 == null) {
             return o2 == null ? 0 : -1;
         } else if (o2 == null) {
-            return o1 == null ? 0 : 1;
+            return 1;
         }
         
         if (o1.length != o2.length) {


Reply via email to