You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2009/02/02 16:35:11 UTC
svn commit: r740007 -
/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
Author: mriou
Date: Mon Feb 2 15:35:11 2009
New Revision: 740007
URL: http://svn.apache.org/viewvc?rev=740007&view=rev
Log:
Guard against null correlations.
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java?rev=740007&r1=740006&r2=740007&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java Mon Feb 2 15:35:11 2009
@@ -60,34 +60,37 @@
try {
CorrelatorDAO corr = processDao.getCorrelator(plink.getName() + "." + op.getName());
// Changing all routes
- for (MessageRouteDAO routeDAO : corr.getAllRoutes()) {
- CorrelationKey oldKey = routeDAO.getCorrelationKey();
- if (oldKey != null) {
- Integer ckeyInt = asInt(oldKey.getCorrelationSetName());
- if (ckeyInt != null) {
- OScope.CorrelationSet ocset = findCorrelationById(ckeyInt, registeredProcesses, process.getConf().getProcessId());
- if (ocset == null) __log.debug("Correlation set not found, couldn't upgrade route " + oldKey.toCanonicalString());
- else {
- routeDAO.setCorrelationKey(new CorrelationKey(ocset.name, oldKey.getValues()));
+ if (corr != null) {
+ for (MessageRouteDAO routeDAO : corr.getAllRoutes()) {
+ CorrelationKey oldKey = routeDAO.getCorrelationKey();
+ if (oldKey != null) {
+ Integer ckeyInt = asInt(oldKey.getCorrelationSetName());
+ if (ckeyInt != null) {
+ OScope.CorrelationSet ocset = findCorrelationById(ckeyInt, registeredProcesses, process.getConf().getProcessId());
+ if (ocset == null) __log.debug("Correlation set not found, couldn't upgrade route " + oldKey.toCanonicalString());
+ else {
+ routeDAO.setCorrelationKey(new CorrelationKey(ocset.name, oldKey.getValues()));
+ }
}
}
}
- }
- // Changing all queued messages
- for (CorrelatorMessageDAO corrMsgDAO : corr.getAllMessages()) {
- CorrelationKey oldKey = corrMsgDAO.getCorrelationKey();
- if (oldKey != null) {
- Integer ckeyInt = asInt(oldKey.getCorrelationSetName());
- if (ckeyInt != null) {
- OScope.CorrelationSet ocset = findCorrelationById(ckeyInt, registeredProcesses, process.getConf().getProcessId());
- if (ocset == null) __log.debug("Correlation set not found, couldn't upgrade route " + oldKey.toCanonicalString());
- else {
- corrMsgDAO.setCorrelationKey(new CorrelationKey(ocset.name, oldKey.getValues()));
+
+ // Changing all queued messages
+ for (CorrelatorMessageDAO corrMsgDAO : corr.getAllMessages()) {
+ CorrelationKey oldKey = corrMsgDAO.getCorrelationKey();
+ if (oldKey != null) {
+ Integer ckeyInt = asInt(oldKey.getCorrelationSetName());
+ if (ckeyInt != null) {
+ OScope.CorrelationSet ocset = findCorrelationById(ckeyInt, registeredProcesses, process.getConf().getProcessId());
+ if (ocset == null) __log.debug("Correlation set not found, couldn't upgrade route " + oldKey.toCanonicalString());
+ else {
+ corrMsgDAO.setCorrelationKey(new CorrelationKey(ocset.name, oldKey.getValues()));
+ }
}
}
}
- }
__log.debug("Migrated routes and message queue for correlator " + plink.getName() + "." + op.getName());
+ }
} catch (IllegalArgumentException e) {
__log.debug("Correlator with id " + plink.getId() + "." +
op.getName() + " couldn't be found, skipping.");