cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1151323 - in /cxf/branches/2.4.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Date Wed, 27 Jul 2011 03:34:24 GMT
Author: dkulp
Date: Wed Jul 27 03:34:23 2011
New Revision: 1151323

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

........
  r1151322 | dkulp | 2011-07-26 23:32:05 -0400 (Tue, 26 Jul 2011) | 1 line
  
  Add ability to control the "DontClose" thing per port
........

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

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 27 03:34:23 2011
@@ -1 +1 @@
-/cxf/trunk:1151152,1151228,1151235
+/cxf/trunk:1151152,1151228,1151235,1151322

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

Modified: cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1151323&r1=1151322&r2=1151323&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Wed Jul 27 03:34:23 2011
@@ -227,7 +227,10 @@ public class JettyHTTPServerEngine
         //this is most often seen in our unit/system tests that 
         //test things in the same VM.
         
-        String s = System.getProperty("org.apache.cxf.transports.http_jetty.DontClosePort");
+        String s = System.getProperty("org.apache.cxf.transports.http_jetty.DontClosePort."
+ port);
+        if (s == null) {
+            s = System.getProperty("org.apache.cxf.transports.http_jetty.DontClosePort");
+        }
         return !Boolean.valueOf(s);
     }
     



Mime
View raw message