Author: mszefler
Date: Wed Mar 7 12:00:31 2007
New Revision: 515724
URL: http://svn.apache.org/viewvc?view=rev&rev=515724
Log:
Fixed NPE when server received an event for a process that was not in the store.
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=515724&r1=515723&r2=515724
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Wed Mar 7 12:00:31 2007
@@ -37,6 +37,7 @@
import org.apache.ode.bpel.engine.CountLRUDehydrationPolicy;
import org.apache.ode.bpel.iapi.BpelEventListener;
import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.iapi.ProcessStoreEvent;
import org.apache.ode.bpel.iapi.ProcessStoreListener;
import org.apache.ode.bpel.iapi.Scheduler;
@@ -64,7 +65,7 @@
*/
public class ODEServer {
- private static final Log __log = LogFactory.getLog(ODEServer.class);
+ protected final Log __log = LogFactory.getLog(getClass());
private static final Messages __msgs =
Messages.getMessages(Messages.class);
@@ -500,7 +501,12 @@
case RETIRED:
// bounce the process
_server.unregister(pse.pid);
- _server.register(_store.getProcessConfiguration(pse.pid));
+ ProcessConf pconf = _store.getProcessConfiguration(pse.pid);
+ if (pconf != null)
+ _server.register(pconf);
+ else {
+ __log.debug("slighly odd: recevied event " + pse + " for
process not in store!");
+ }
break;
case DISABLED:
case UNDEPLOYED:
