cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1304494 - in /cxf/branches/2.4.x-fixes: ./ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
Date Fri, 23 Mar 2012 17:17:03 GMT
Author: dkulp
Date: Fri Mar 23 17:17:02 2012
New Revision: 1304494

URL: http://svn.apache.org/viewvc?rev=1304494&view=rev
Log:
Merged revisions 1304430 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1304430 | dkulp | 2012-03-23 11:16:36 -0400 (Fri, 23 Mar 2012) | 10 lines
  
  Merged revisions 1304394 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1304394 | dkulp | 2012-03-23 10:54:49 -0400 (Fri, 23 Mar 2012) | 3 lines
  
    Fix problem with calling stop()on Corba endpoints not properly
    de-registering the endpoint.
  
  ........
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java?rev=1304494&r1=1304493&r2=1304494&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
Fri Mar 23 17:17:02 2012
@@ -131,6 +131,7 @@ public class CorbaDestination implements
     }
 
     public void shutdown() {
+        deactivate();
         if (orb != null) {
             try {
                 // Ask for the ORB to be destroyed.  If another destination is using it,
we'll



Mime
View raw message