Author: rmannibucau
Date: Tue Aug 21 18:44:20 2012
New Revision: 1375714
URL: http://svn.apache.org/viewvc?rev=1375714&view=rev
Log:
waiting a lot in arquillian debug mode to be sure we don't have a timing issue
linked to tomcat
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1375714&r1=1375713&r2=1375714&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Tue Aug 21 18:44:20 2012
@@ -329,6 +329,14 @@ public abstract class TomEEContainer<Con
}
return lookupDeployerWithRetry(retry - 1);
}
+ if (Boolean.getBoolean("openejb.arquillian.debug") && retry >= 0) {
+ try { // wait a lot to be sure that's not a timing issue
+ Thread.sleep(10000);
+ } catch (InterruptedException ignored) {
+ // no-op
+ }
+ return lookupDeployerWithRetry(-1);
+ }
throw ne;
}
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1375714&r1=1375713&r2=1375714&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Tue Aug 21 18:44:20 2012
@@ -442,12 +442,11 @@ public class RemoteServer {
private boolean connect(int tries) {
if (verbose) System.out.println("[] CONNECT ATTEMPT " + (this.tries -
tries));
- //System.out.println("CONNECT "+ tries);
- try {
- Socket socket = new Socket(host, shutdownPort);
- OutputStream out = socket.getOutputStream();
- out.close();
+ Socket socket = null;
+ try {
+ socket = new Socket(host, shutdownPort);
+ socket.getOutputStream().close();
if (verbose) System.out.println("[] CONNECTED IN " + (this.tries -
tries));
} catch (Exception e) {
if (tries < 2) {
@@ -461,6 +460,14 @@ public class RemoteServer {
}
return connect(--tries);
}
+ } finally {
+ if (socket != null) {
+ try {
+ socket.close();
+ } catch (Exception ignored) {
+ // no-op
+ }
+ }
}
return true;
