Author: ningjiang Date: Tue Mar 29 14:30:49 2011 New Revision: 1086596 URL: http://svn.apache.org/viewvc?rev=1086596&view=rev Log: Merged revisions 1086576 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1086576 | ningjiang | 2011-03-29 21:27:25 +0800 (Tue, 29 Mar 2011) | 9 lines 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.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 29 14:30:49 2011 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1065486,1069254,1069739,1070037,1086103 -/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720,1070034,1086102 +/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1065486,1069254,1069739,1070037,1086103,1086576 +/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249,1069720,1070034,1086102,1086573 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?rev=1086596&r1=1086595&r2=1086596&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (original) +++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Tue Mar 29 14:30:49 2011 @@ -157,8 +157,8 @@ public class ServerImpl implements Serve return; } } - getDestination().setMessageObserver(null); getDestination().shutdown(); + getDestination().setMessageObserver(null); } public void destroy() {
