Author: ningjiang
Date: Wed Nov  7 12:25:29 2007
New Revision: 592878

URL: http://svn.apache.org/viewvc?rev=592878&view=rev
Log:
CXF-865 Calling connector.stop() before connector.close(), also moved 
server.stop() to the finally block

Modified:
    
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

Modified: 
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=592878&r1=592877&r2=592878&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
 Wed Nov  7 12:25:29 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;
+            }
         }
     }
     


Reply via email to