Author: ningjiang
Date: Tue Mar 29 13:27:25 2011
New Revision: 1086576
URL: http://svn.apache.org/viewvc?rev=1086576&view=rev
Log:
Merged revisions 1086573 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1086573 | ningjiang | 2011-03-29 21:17:46 +0800 (Tue, 29 Mar 2011) | 1 line
CXF-3429 shutdown the destination before set the MessageObserver to be null
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 29 13:27:25 2011
@@ -1 +1 @@
-/cxf/trunk:1084966,1086102,1086115,1086535
+/cxf/trunk:1084966,1086102,1086115,1086535,1086573
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?rev=1086576&r1=1086575&r2=1086576&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
Tue Mar 29 13:27:25 2011
@@ -157,8 +157,8 @@ public class ServerImpl implements Serve
return;
}
}
- getDestination().setMessageObserver(null);
getDestination().shutdown();
+ getDestination().setMessageObserver(null);
}
public void destroy() {
