svn commit: r588077 - in /ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine: BpelServerImpl.java Messages.java

[mriou]

Author: mriou
Date: Wed Oct 24 16:16:19 2007
New Revision: 588077

URL: http://svn.apache.org/viewvc?rev=588077&view=rev
Log:
ODE-204 Patch from Rich for some logging and map cleanup.

Modified:
    
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
    
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?rev=588077&r1=588076&r2=588077&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
 Wed Oct 24 16:16:19 2007
@@ -296,12 +296,13 @@
         try {
             BpelProcess p = null;
             if (_engine != null) {
-                _engine.unregisterProcess(pid);
-                _registeredProcesses.remove(p);
+                p = _engine.unregisterProcess(pid);
+                if (p != null)
+                {
+                       _registeredProcesses.remove(p);
+                       __log.info(__msgs.msgProcessUnregistered(pid));
+                }
             }
-
-            __log.info(__msgs.msgProcessUnregistered(pid));
-
         } catch (Exception ex) {
             __log.error(__msgs.msgProcessUnregisterFailed(pid), ex);
             throw new BpelEngineException(ex);

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java?rev=588077&r1=588076&r2=588077&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Messages.java
 Wed Oct 24 16:16:19 2007
@@ -55,8 +55,12 @@
         return format("Unkown EPR: {0}", epr);
     }
 
-    String msgProcessUnregistered(QName process) {
-        return format("Process {0} has been unregistered.", process);
+    String msgProcessRegistered(QName pid) {
+        return format("Registered process {0}.", pid);
+    }
+    
+    String msgProcessUnregistered(QName pid) {
+        return format("Unregistered process {0}.", pid);
     }
 
     String msgProcessUnregisterFailed(QName process) {
@@ -130,10 +134,6 @@
 
     String msgOperationInterrupted() {
         return format("Operation was interrupted.");
-    }
-
-    String msgProcessRegistered(QName pid) {
-        return format("Activated process {0}.", pid);
     }
 
     String msgServerStarted() {