cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [2/5] git commit: [CXF-6041] Allow deactive/shutdown to proceed without exception if the POA is already deactivated.
Date Tue, 28 Oct 2014 18:30:16 GMT
[CXF-6041] Allow deactive/shutdown to proceed without exception if the POA is already deactivated.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1e8804d6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1e8804d6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1e8804d6

Branch: refs/heads/2.7.x-fixes
Commit: 1e8804d62276d244cb8f48f05983d18283938a45
Parents: f56fbce
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Oct 28 14:00:05 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Oct 28 14:29:58 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/binding/corba/CorbaDestination.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1e8804d6/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
index b94de2f..ed1deb9 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
@@ -52,6 +52,7 @@ import org.omg.PortableServer.LifespanPolicyValue;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.POAHelper;
 import org.omg.PortableServer.POAManager;
+import org.omg.PortableServer.POAPackage.ObjectNotActive;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ThreadPolicyValue;
@@ -356,6 +357,9 @@ public class CorbaDestination implements MultiplexDestination {
 
             try {
                 bindingPOA.deactivate_object(objectId);
+            } catch (ObjectNotActive ona) {
+                LOG.info("Caught ObjectNotActive exception: " + ona
+                         + " during deactivate_object() call on POA: " + bindingPOA);
             } catch (Exception ex) {
                 throw new CorbaBindingException("Unable to deactivate CORBA servant", ex);
             }


Mime
View raw message