svn commit: r633264 - /ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java

[boisvert]

Author: boisvert
Date: Mon Mar  3 12:33:45 2008
New Revision: 633264

URL: http://svn.apache.org/viewvc?rev=633264&view=rev
Log:
Fix ODE-244: Potential NPE in MessageExchangeDAOImpl

Modified:
    
ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java

Modified: 
ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java?rev=633264&r1=633263&r2=633264&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
 Mon Mar  3 12:33:45 2008
@@ -317,13 +317,15 @@
 
        public Collection<CorrelationKey> getCorrelationKeys() {
         ArrayList<CorrelationKey> correlationKeys = new 
ArrayList<CorrelationKey>();
-        if (_correlationKeys.indexOf("^") > 0) {
-            for (StringTokenizer tokenizer = new 
StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
-                String corrStr = tokenizer.nextToken();
-                correlationKeys.add(new CorrelationKey(corrStr));
-            }
-            return correlationKeys;
-        } else correlationKeys.add(new CorrelationKey(_correlationKeys));
+        if (_correlationKeys != null) {
+            if (_correlationKeys.indexOf("^") > 0) {
+                for (StringTokenizer tokenizer = new 
StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
+                    String corrStr = tokenizer.nextToken();
+                    correlationKeys.add(new CorrelationKey(corrStr));
+                }
+                return correlationKeys;
+            } else correlationKeys.add(new CorrelationKey(_correlationKeys));
+        }
         return correlationKeys;
     }