Author: [email protected]
Date: Tue Sep 20 14:26:46 2011
New Revision: 1400
Log:
[AMDATUCASSANDRA-89] Fixed possible NullPointerException in cassandra update
listener and fixed invalid column family definition in nonce store.
Modified:
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
trunk/amdatu-cassandra/cassandra-store-nonce/src/main/java/org/amdatu/cassandra/store/nonce/service/NonceColumnFamilyProvider.java
Modified:
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
Tue Sep 20 14:26:46 2011
@@ -191,12 +191,16 @@
+ keyspace + "' for the
keyspace-global ColumnFamilyProvider '"
+
provider.getClass().getName() + "'");
final String cfName =
cfDef.getName();
- String columnType =
cfDef.getColumnType().getValue();
+ String columnType =
cfDef.getColumnType().getValue();
String comparatorType =
cfDef.getCompareWith().getValue();
- String subComparatorType =
cfDef.getCompareSubcolumnsWith().getValue();
+ String subComparatorType = null;
+ if
(cfDef.getCompareSubcolumnsWith() != null) {
+ subComparatorType =
cfDef.getCompareSubcolumnsWith().getValue();
+ }
+
m_daemonService.addColumnFamily(keyspace, cfName, columnType,
comparatorType,
subComparatorType);
- }
+
}
}
}
}
Modified:
trunk/amdatu-cassandra/cassandra-store-nonce/src/main/java/org/amdatu/cassandra/store/nonce/service/NonceColumnFamilyProvider.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-store-nonce/src/main/java/org/amdatu/cassandra/store/nonce/service/NonceColumnFamilyProvider.java
(original)
+++
trunk/amdatu-cassandra/cassandra-store-nonce/src/main/java/org/amdatu/cassandra/store/nonce/service/NonceColumnFamilyProvider.java
Tue Sep 20 14:26:46 2011
@@ -35,7 +35,7 @@
new String[]
{CassandraPersistenceManager.DEFAULT_KEYSPACE},
ColumnType.STANDARD,
CompareType.BYTESTYPE,
- CompareType.BYTESTYPE)};
+ null)};
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
