You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2010/04/22 02:03:56 UTC
svn commit: r936575 - in /qpid/trunk/qpid/java:
common/src/main/java/org/apache/qpid/util/concurrent/
common/src/test/java/org/apache/qpid/transport/
systests/src/main/java/org/apache/qpid/test/unit/client/connection/
Author: rajith
Date: Thu Apr 22 00:03:56 2010
New Revision: 936575
URL: http://svn.apache.org/viewvc?rev=936575&view=rev
Log:
QPID-2498
Committing a patch from Emmanuel Bourg
Removed:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/Condition.java
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java?rev=936575&r1=936574&r2=936575&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java Thu Apr 22 00:03:56 2010
@@ -22,8 +22,6 @@ package org.apache.qpid.transport;
import org.apache.mina.util.AvailablePortFinder;
-import org.apache.qpid.util.concurrent.Condition;
-
import org.apache.qpid.transport.network.ConnectionBinding;
import org.apache.qpid.transport.network.io.IoAcceptor;
import org.apache.qpid.transport.util.Logger;
@@ -34,6 +32,8 @@ import junit.framework.TestCase;
import java.util.ArrayList;
import java.util.List;
import java.util.Collections;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import java.io.IOException;
import static org.apache.qpid.transport.Option.*;
@@ -157,7 +157,7 @@ public class ConnectionTest extends Test
null, msg, sync ? SYNC : NONE);
}
- private Connection connect(final Condition closed)
+ private Connection connect(final CountDownLatch closed)
{
Connection conn = new Connection();
conn.addConnectionListener(new ConnectionListener()
@@ -171,7 +171,7 @@ public class ConnectionTest extends Test
{
if (closed != null)
{
- closed.set();
+ closed.countDown();
}
}
});
@@ -188,7 +188,7 @@ public class ConnectionTest extends Test
// Start server as 0-9 to froce a ProtocolVersionException
startServer(new ProtocolHeader(1, 0, 9));
- Condition closed = new Condition();
+ CountDownLatch closed = new CountDownLatch(1);
try
{
@@ -249,13 +249,13 @@ public class ConnectionTest extends Test
{
startServer();
- Condition closed = new Condition();
+ CountDownLatch closed = new CountDownLatch(1);
Connection conn = connect(closed);
Session ssn = conn.createSession(1);
send(ssn, "CLOSE");
- if (!closed.get(3000))
+ if (!closed.await(3, TimeUnit.SECONDS))
{
fail("never got notified of connection close");
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java?rev=936575&r1=936574&r2=936575&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java Thu Apr 22 00:03:56 2010
@@ -22,8 +22,8 @@ package org.apache.qpid.test.unit.client
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.concurrent.Condition;
-
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import javax.jms.Connection;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
@@ -42,18 +42,18 @@ public class ExceptionListenerTest exten
conn.start();
- final Condition fired = new Condition();
+ final CountDownLatch fired = new CountDownLatch(1);
conn.setExceptionListener(new ExceptionListener()
{
public void onException(JMSException e)
{
- fired.set();
+ fired.countDown();
}
});
stopBroker();
- if (!fired.get(3000))
+ if (!fired.await(3, TimeUnit.SECONDS))
{
fail("exception listener was not fired");
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org