You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/06/20 12:16:20 UTC
svn commit: r1686544 - in /axis/axis2/java/core/trunk/modules:
integration/pom.xml jaxws-integration/pom.xml
transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
Author: veithen
Date: Sat Jun 20 10:16:20 2015
New Revision: 1686544
URL: http://svn.apache.org/r1686544
Log:
Speed up test execution.
Modified:
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=1686544&r1=1686543&r2=1686544&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sat Jun 20 10:16:20 2015
@@ -521,6 +521,10 @@
<name>java.awt.headless</name>
<value>true</value>
</property>
+ <property>
+ <name>org.apache.axis2.transport.http.server.fastShutdown</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1686544&r1=1686543&r2=1686544&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Sat Jun 20 10:16:20 2015
@@ -1415,6 +1415,10 @@
<name>java.awt.headless</name>
<value>true</value>
</property>
+ <property>
+ <name>org.apache.axis2.transport.http.server.fastShutdown</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java?rev=1686544&r1=1686543&r2=1686544&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java Sat Jun 20 10:16:20 2015
@@ -84,7 +84,9 @@ public class SimpleHttpServer {
// Attempt to terminate the active processors nicely
LOG.info("Shut down HTTP processors");
this.requestExecutor.shutdownNow();
- this.requestExecutor.awaitTermination(SHUTDOWN_GRACE_PERIOD, TimeUnit.MILLISECONDS);
+ if (!Boolean.parseBoolean(System.getProperty("org.apache.axis2.transport.http.server.fastShutdown", "false"))) {
+ this.requestExecutor.awaitTermination(SHUTDOWN_GRACE_PERIOD, TimeUnit.MILLISECONDS);
+ }
if (!this.requestExecutor.isTerminated()) {
// Terminate the active processors forcibly
LOG.info("Force shut down HTTP processors");