tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject svn commit: r1358160 - in /openejb/trunk/openejb/server: openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
Date Fri, 06 Jul 2012 12:29:11 GMT
Author: andygumbrecht
Date: Fri Jul  6 12:29:10 2012
New Revision: 1358160

URL: http://svn.apache.org/viewvc?rev=1358160&view=rev
Log:
Cannot call clear on futures list - Just let it go out of scope

Modified:
    openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
    openejb/trunk/openejb/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java

Modified: openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java?rev=1358160&r1=1358159&r2=1358160&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
(original)
+++ openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
Fri Jul  6 12:29:10 2012
@@ -334,9 +334,7 @@ public class MulticastPulseClient extend
             }
         }
 
-        futures.clear();
-
-        return set;
+        return new HashSet<URI>(set);
     }
 
     /**
@@ -531,7 +529,7 @@ public class MulticastPulseClient extend
                             boolean b = false;
                             final Socket s = new Socket();
                             try {
-                                s.connect(new InetSocketAddress(host, port), 1000);
+                                s.connect(new InetSocketAddress(host, port), 500);
                                 b = true;
                             } catch (Throwable e) {
                                 //Ignore

Modified: openejb/trunk/openejb/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java?rev=1358160&r1=1358159&r2=1358160&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
(original)
+++ openejb/trunk/openejb/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
Fri Jul  6 12:29:10 2012
@@ -328,7 +328,6 @@ public class MulticastPulseAgentTest {
             }
         }
 
-        futures.clear();
         System.out.println();
 
         for (final URI uri : set) {



Mime
View raw message