Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5ED4888E3 for ; Thu, 1 Sep 2011 19:39:21 +0000 (UTC) Received: (qmail 63142 invoked by uid 500); 1 Sep 2011 19:39:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62646 invoked by uid 500); 1 Sep 2011 19:39:20 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 62408 invoked by uid 99); 1 Sep 2011 19:39:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2011 19:39:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2011 19:39:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1F6FD23889E3 for ; Thu, 1 Sep 2011 19:38:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164227 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Date: Thu, 01 Sep 2011 19:38:58 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110901193858.1F6FD23889E3@eris.apache.org> Author: dkulp Date: Thu Sep 1 19:38:57 2011 New Revision: 1164227 URL: http://svn.apache.org/viewvc?rev=1164227&view=rev Log: 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.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?rev=1164227&r1=1164226&r2=1164227&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (original) +++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Thu Sep 1 19:38:57 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) {