Author: [email protected]
Date: Tue Sep 13 09:01:27 2011
New Revision: 1356

Log:
[AMDATUCASSANDRA-71] Fixed nullpointer by adding check

Modified:
   
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java

Modified: 
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
==============================================================================
--- 
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
 (original)
+++ 
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
 Tue Sep 13 09:01:27 2011
@@ -365,7 +365,10 @@
 
     private boolean equalComparator(String cfDefCompType, String compType) {
         String marshalPackage = "org.apache.cassandra.db.marshal.";
-        if (cfDefCompType == null && compType != null) {
+        if (cfDefCompType == null && compType == null) {
+            return true;
+        }
+        else if (cfDefCompType == null && compType != null) {
             return false;
         }
         else if (cfDefCompType != null && compType == null) {
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to