svn commit: r593680 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

[dkulp]

Author: dkulp
Date: Fri Nov  9 14:49:56 2007
New Revision: 593680

URL: http://svn.apache.org/viewvc?rev=593680&view=rev
Log:
Merged revisions 592878 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r592878 | ningjiang | 2007-11-07 15:25:29 -0500 (Wed, 07 Nov 2007) | 1 line
  
  CXF-865 Calling connector.stop() before connector.close(), also moved 
server.stop() to the finally block
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

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

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=593680&r1=593679&r2=593680&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 Fri Nov  9 14:49:56 2007
@@ -544,11 +544,14 @@
      */
     protected void stop() throws Exception {
         if (server != null) {
-            
-            connector.close();
-            server.stop();
-            server.destroy();
-            server = null;
+            try {
+                connector.stop();
+                connector.close();            
+            } finally {         
+                server.stop();
+                server.destroy();
+                server = null;
+            }
         }
     }