Author: veithen
Date: Tue Dec 20 22:21:31 2011
New Revision: 1221506
URL: http://svn.apache.org/viewvc?rev=1221506&view=rev
Log:
Merged r1220630 to the 1.6 branch for use in the Sandesha2 build.
Added:
axis/axis2/java/core/branches/1_6/modules/testutils/src/main/java/org/apache/axis2/testutils/PortAllocator.java
- copied unchanged from r1220630,
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/PortAllocator.java
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
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 Tue Dec 20 22:21:31 2011
@@ -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,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
214118
+/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,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
214118,1220630
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java?rev=1221506&r1=1221505&r2=1221506&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
Tue Dec 20 22:21:31 2011
@@ -77,8 +77,11 @@ public class DefaultConnectionListener i
if (LOG.isInfoEnabled()) {
LOG.info("Listening on port " + port);
}
- serversocket = new ServerSocket(port);
- serversocket.setReuseAddress(true);
+ synchronized (this) {
+ serversocket = new ServerSocket(port);
+ serversocket.setReuseAddress(true);
+ notifyAll();
+ }
}
LOG.debug("Waiting for incoming HTTP connection");
Socket socket = this.serversocket.accept();
@@ -106,12 +109,26 @@ public class DefaultConnectionListener i
}
} finally {
destroy();
+ synchronized (this) {
+ notifyAll();
+ }
}
}
- public void close() throws IOException {
+ public synchronized void awaitSocketOpen() throws InterruptedException {
+ while (serversocket == null) {
+ wait();
+ }
+ }
+
+ public synchronized int getPort() {
+ return serversocket.getLocalPort();
+ }
+
+ public synchronized void close() throws IOException {
if (this.serversocket != null) {
this.serversocket.close();
+ this.serversocket = null;
}
}
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=1221506&r1=1221505&r2=1221506&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
Tue Dec 20 22:21:31 2011
@@ -38,7 +38,7 @@ public class SimpleHttpServer {
private static final int SHUTDOWN_GRACE_PERIOD = 3000; // ms
private HttpFactory httpFactory;
- private final int port;
+ private int port;
private final HttpParams params;
private final WorkerFactory workerFactory;
@@ -96,7 +96,14 @@ public class SimpleHttpServer {
}
public void start() {
- this.listenerExecutor.execute(this.listener);
+ DefaultConnectionListener listener =
(DefaultConnectionListener)this.listener;
+ this.listenerExecutor.execute(listener);
+ try {
+ listener.awaitSocketOpen();
+ port = listener.getPort();
+ } catch (InterruptedException ex) {
+ Thread.currentThread().interrupt();
+ }
}
public boolean isRunning() {
