Author: sergeyb
Date: Thu Aug 15 14:21:02 2013
New Revision: 1514289

URL: http://svn.apache.org/r1514289
Log:
Preventing a resource leak if JAX-RS server fails to start, copying a fix 
Amichai did for Simple Frontend

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=1514289&r1=1514288&r2=1514289&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
 Thu Aug 15 14:21:02 2013
@@ -197,7 +197,12 @@ public class JAXRSServerFactoryBean exte
             
             
             if (start) {
-                server.start();
+                try {
+                    server.start();
+                } catch (RuntimeException re) {
+                    server.destroy(); // prevent resource leak
+                    throw re;
+                }
             }
         } catch (EndpointException e) {
             throw new ServiceConstructionException(e);


Reply via email to