Author: dkulp Date: Thu Sep 1 19:43:37 2011 New Revision: 1164233 URL: http://svn.apache.org/viewvc?rev=1164233&view=rev Log: Merged revisions 1164227 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1164227 | dkulp | 2011-09-01 15:38:57 -0400 (Thu, 01 Sep 2011) | 10 lines Merged revisions 1164218 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1164218 | dkulp | 2011-09-01 15:22:04 -0400 (Thu, 01 Sep 2011) | 2 lines [CXF-3785] Make sure the start method can only be called if the service is stopped ........ ................ 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/ ------------------------------------------------------------------------------ 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=1164233&r1=1164232&r2=1164233&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 Thu Sep 1 19:43:37 2011 @@ -48,7 +48,7 @@ public class ServerImpl implements Serve private BindingFactory bindingFactory; private MessageObserver messageObserver; private ManagedEndpoint mep; - private boolean stopped; + private boolean stopped = true; public ServerImpl(Bus bus, Endpoint endpoint, @@ -119,7 +119,10 @@ public class ServerImpl implements Serve this.destination = destination; } - public void start() { + public void start() { + if (!stopped) { + return; + } LOG.fine("Server is starting."); if (messageObserver != null) {
