You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by bo...@apache.org on 2008/03/03 21:34:21 UTC
svn commit: r633265 -
/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
Author: boisvert
Date: Mon Mar 3 12:34:18 2008
New Revision: 633265
URL: http://svn.apache.org/viewvc?rev=633265&view=rev
Log:
Fix ODE-244: Potential NPE in MessageExchangeDAOImpl
Modified:
ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
Modified: ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java?rev=633265&r1=633264&r2=633265&view=diff
==============================================================================
--- ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java (original)
+++ ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java Mon Mar 3 12:34:18 2008
@@ -338,6 +338,7 @@
public Collection<CorrelationKey> getCorrelationKeys() {
ArrayList<CorrelationKey> correlationKeys = new ArrayList<CorrelationKey>();
+ if (_correlationKeys != null) {
if (_correlationKeys.indexOf("^") > 0) {
for (StringTokenizer tokenizer = new StringTokenizer(_correlationKeys, "^"); tokenizer.hasMoreTokens();) {
String corrStr = tokenizer.nextToken();
@@ -345,6 +346,7 @@
}
return correlationKeys;
} else correlationKeys.add(new CorrelationKey(_correlationKeys));
+ }
return correlationKeys;
}