Author: veithen
Date: Sat Jun 20 12:04:37 2015
New Revision: 1686581
URL: http://svn.apache.org/r1686581
Log:
Merge r1686544 (with changes) to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 20 12:04:37 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1649688
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1649688,1686544
Modified: axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/pom.xml?rev=1686581&r1=1686580&r2=1686581&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/integration/pom.xml Sat Jun 20
12:04:37 2015
@@ -200,6 +200,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>
@@ -249,6 +253,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/branches/1_6/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml?rev=1686581&r1=1686580&r2=1686581&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
(original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml Sat Jun
20 12:04:37 2015
@@ -1395,6 +1395,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/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java?rev=1686581&r1=1686580&r2=1686581&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
Sat Jun 20 12:04:37 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");
