Author: andygumbrecht
Date: Mon Jul 9 13:52:14 2012
New Revision: 1359172
URL: http://svn.apache.org/viewvc?rev=1359172&view=rev
Log:
Return a copy of the lookup set.
Re-enable assert in test.
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=1359172&r1=1359171&r2=1359172&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
Mon Jul 9 13:52:14 2012
@@ -341,7 +341,12 @@ public class MulticastPulseClient extend
}
}
- return set;
+ setLock.lock();
+ try {
+ return new HashSet<URI>(set);
+ } finally {
+ setLock.unlock();
+ }
}
/**
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=1359172&r1=1359171&r2=1359172&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
Mon Jul 9 13:52:14 2012
@@ -348,7 +348,7 @@ public class MulticastPulseAgentTest {
System.out.println("Multipulse complete");
//If timeout == 1 assume either a cancel or the test took too long
(Will not fail)
- //org.junit.Assert.assertTrue(timeout == 1 || set.size() > 0);
+ org.junit.Assert.assertTrue(timeout == 1 || set.size() > 0);
}
private String ipFormat(final String h) throws UnknownHostException {
