svn commit: r1022058 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq: transport/failover/FailoverTransactionTest.java util/SocketProxy.java

[gtully]

Author: gtully
Date: Wed Oct 13 10:08:10 2010
New Revision: 1022058

URL: http://svn.apache.org/viewvc?rev=1022058&view=rev
Log:
resolve failovertransactiontest hang in hudson

Modified:
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java?rev=1022058&r1=1022057&r2=1022058&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
 Wed Oct 13 10:08:10 2010
@@ -71,6 +71,12 @@ public class FailoverTransactionTest ext
         startBroker(true);
     }
 
+    public void setUp() throws Exception {
+        super.setMaxTestTime(20 * 60 * 1000); // some boxes can be real slow
+        super.setAutoFail(true);
+        super.setUp();
+    }
+
     public void tearDown() throws Exception {
         stopBroker();
     }

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java?rev=1022058&r1=1022057&r2=1022058&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java
 Wed Oct 13 10:08:10 2010
@@ -79,6 +79,7 @@ public class SocketProxy {
 
     public void open() throws Exception {
         serverSocket = new ServerSocket();
+        serverSocket.setReuseAddress(true);
         if (receiveBufferSize > 0) {
             serverSocket.setReceiveBufferSize(receiveBufferSize);
         }