svn commit: r920537 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra: config/CFMetaData.java config/KSMetaData.java utils/FBUtilities.java

[gdusbabek]

Author: gdusbabek
Date: Mon Mar  8 22:00:51 2010
New Revision: 920537

URL: http://svn.apache.org/viewvc?rev=920537&view=rev
Log:
CASSANDRA-862 Replace usage of FBUtilities.equals with apache-commons 
equivalent. Patch by Gabriele Renzi, reviewed by Gary Dusbabek.

Modified:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=920537&r1=920536&r2=920537&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java 
Mon Mar  8 22:00:51 2010
@@ -31,6 +31,8 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.lang.ObjectUtils;
+
 public final class CFMetaData
 {
     public final static double DEFAULT_KEY_CACHE_SIZE = 0.1;
@@ -156,8 +158,8 @@
                 && other.cfName.equals(cfName)
                 && other.columnType.equals(columnType)
                 && other.comparator.equals(comparator)
-                && FBUtilities.equals(other.subcolumnComparator, 
subcolumnComparator)
-                && FBUtilities.equals(other.comment, comment)
+                && ObjectUtils.equals(other.subcolumnComparator, 
subcolumnComparator)
+                && ObjectUtils.equals(other.comment, comment)
                 && other.rowCacheSize == rowCacheSize
                 && other.keyCacheSize == keyCacheSize
                 && other.cfId == cfId;

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java?rev=920537&r1=920536&r2=920537&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java 
Mon Mar  8 22:00:51 2010
@@ -20,7 +20,6 @@
 
 import org.apache.cassandra.locator.AbstractReplicationStrategy;
 import org.apache.cassandra.locator.IEndPointSnitch;
-import org.apache.cassandra.utils.FBUtilities;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -31,6 +30,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang.ObjectUtils;
+
 public final class KSMetaData
 {
     public final String name;
@@ -59,7 +60,7 @@
             return false;
         KSMetaData other = (KSMetaData)obj;
         return other.name.equals(name)
-                && FBUtilities.equals(other.strategyClass, strategyClass)
+                && ObjectUtils.equals(other.strategyClass, strategyClass)
                 && other.replicationFactor == replicationFactor
                 && sameEpSnitch(other, this)
                 && other.cfMetaData.size() == cfMetaData.size()

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=920537&r1=920536&r2=920537&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java 
Mon Mar  8 22:00:51 2010
@@ -452,15 +452,4 @@
         }
     }
 
-    public static boolean equals(Object a, Object b)
-    {
-        if (a == null && b == null)
-            return true;
-        else if (a != null && b == null)
-            return false;
-        else if (a == null && b != null)
-            return false;
-        else
-            return a.equals(b);
-    }
 }