Author: [email protected]
Date: Fri Jun 22 17:32:40 2012
New Revision: 2532

Log:
[AMDATUCASSANDRA-213] Fixed NullPointerException

Modified:
   
branches/amdatu-cassandra-0.2.5/cassandra-stores/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java

Modified: 
branches/amdatu-cassandra-0.2.5/cassandra-stores/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java
==============================================================================
--- 
branches/amdatu-cassandra-0.2.5/cassandra-stores/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java
       (original)
+++ 
branches/amdatu-cassandra-0.2.5/cassandra-stores/cassandra-store-consumer/src/main/java/org/amdatu/cassandra/store/consumer/service/CassandraConsumerStorageProviderImpl.java
       Fri Jun 22 17:32:40 2012
@@ -157,8 +157,11 @@
         List<OAuthServiceConsumer> consumers = new 
ArrayList<OAuthServiceConsumer>();
         for (String row : rows) {
             OAuthServiceConsumer consumer = getConsumer(row);
-            if (filterConsumer == null
-                || 
consumer.getProperties().get(OAuthServiceConsumer.OWNERID).equals(filterConsumer))
 {
+            String ownerId = null;
+            if (consumer.getProperties() != null) {
+                ownerId = 
consumer.getProperties().get(OAuthServiceConsumer.OWNERID);
+            }
+            if (filterConsumer == null || ownerId == null || 
filterConsumer.equals(ownerId)) {
                 consumers.add(getConsumer(row));
             }
         }
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to