You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/10/11 07:58:09 UTC

[1/3] camel git commit: added null check before trying to call containsKey (prevent NPE)

Repository: camel
Updated Branches:
  refs/heads/master cb6c9bc0b -> 607b4a864


added null check before trying to call containsKey (prevent NPE)


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed687f94
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed687f94
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed687f94

Branch: refs/heads/master
Commit: ed687f94fc86be66bb933e8d028969530964b962
Parents: 1a1a85c
Author: Michael L�ck <mi...@hm-ag.de>
Authored: Wed Oct 5 15:22:51 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Oct 11 09:43:42 2016 +0200

----------------------------------------------------------------------
 .../aggregate/hazelcast/HazelcastAggregationRepository.java       | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ed687f94/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 33185f0..9dd0c17 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -296,7 +296,10 @@ public class HazelcastAggregationRepository extends ServiceSupport
      * @param key Object - key in question
      */
     public boolean containsKey(Object key){
+      if(cache != null)
         return cache.containsKey(key);
+      else
+        return false;
     }
     
     public boolean isAllowSerializedHeaders() {


[3/3] camel git commit: Fixed CS

Posted by ac...@apache.org.
Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/607b4a86
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/607b4a86
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/607b4a86

Branch: refs/heads/master
Commit: 607b4a8640584f445268bef9e909ba4403fb4a22
Parents: ed687f9
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Oct 11 09:54:45 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Oct 11 09:54:45 2016 +0200

----------------------------------------------------------------------
 .../hazelcast/HazelcastAggregationRepository.java        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/607b4a86/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 9dd0c17..309aee5 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -295,11 +295,12 @@ public class HazelcastAggregationRepository extends ServiceSupport
      * 
      * @param key Object - key in question
      */
-    public boolean containsKey(Object key){
-      if(cache != null)
-        return cache.containsKey(key);
-      else
-        return false;
+    public boolean containsKey(Object key) {
+        if (cache != null) {
+            return cache.containsKey(key);
+        } else {
+            return false;
+        }
     }
     
     public boolean isAllowSerializedHeaders() {


[2/3] camel git commit: added method to check for key existence

Posted by ac...@apache.org.
added method to check for key existence


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a1a85cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a1a85cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a1a85cd

Branch: refs/heads/master
Commit: 1a1a85cdbe4d58d5299b2a63c1c73aaf5e610fd2
Parents: cb6c9bc
Author: Michael L�ck <mi...@hm-ag.de>
Authored: Tue Oct 4 11:18:04 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Oct 11 09:43:42 2016 +0200

----------------------------------------------------------------------
 .../aggregate/hazelcast/HazelcastAggregationRepository.java | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1a1a85cd/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
index 530bd8c..33185f0 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/processor/aggregate/hazelcast/HazelcastAggregationRepository.java
@@ -290,6 +290,15 @@ public class HazelcastAggregationRepository extends ServiceSupport
         return unmarshallExchange(camelContext, cache.get(key));
     }
     
+    /**
+     * Checks if the key in question is in the repository.
+     * 
+     * @param key Object - key in question
+     */
+    public boolean containsKey(Object key){
+        return cache.containsKey(key);
+    }
+    
     public boolean isAllowSerializedHeaders() {
         return allowSerializedHeaders;
     }