You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2016/05/25 11:52:11 UTC
activemq git commit: resolve intermittent failure - if broker closes
socket on security excepiton before client gets response
Repository: activemq
Updated Branches:
refs/heads/master e467f34cc -> 3b626c9ed
resolve intermittent failure - if broker closes socket on security excepiton before client gets response
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3b626c9e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3b626c9e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3b626c9e
Branch: refs/heads/master
Commit: 3b626c9edc4525ef5bd13e041cc41f734ddd4abe
Parents: e467f34
Author: gtully <ga...@gmail.com>
Authored: Wed May 25 12:51:56 2016 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 25 12:51:56 2016 +0100
----------------------------------------------------------------------
.../apache/activemq/transport/stomp/StompTest.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/3b626c9e/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
----------------------------------------------------------------------
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
index e895fd1..c6a50eb 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.IOException;
import java.io.StringReader;
import java.net.SocketTimeoutException;
import java.util.Arrays;
@@ -891,10 +892,10 @@ public class StompTest extends StompTestSupport {
String frame = "CONNECT\n" + "login: dejanb\n" + "passcode:manager\n\n" + Stomp.NULL;
stompConnection.sendFrame(frame);
- String f = stompConnection.receiveFrame();
-
- assertTrue(f.startsWith("ERROR"));
- assertClients(1);
+ try {
+ String f = stompConnection.receiveFrame();
+ assertTrue(f.startsWith("ERROR"));
+ } catch (IOException socketMayBeClosedFirstByBroker) {}
}
@Test(timeout = 60000)
@@ -903,10 +904,10 @@ public class StompTest extends StompTestSupport {
String frame = "CONNECT\n" + "login:system\n" + "passcode: dejanb\n\n" + Stomp.NULL;
stompConnection.sendFrame(frame);
- String f = stompConnection.receiveFrame();
-
- assertTrue(f.startsWith("ERROR"));
- assertClients(1);
+ try {
+ String f = stompConnection.receiveFrame();
+ assertTrue(f.startsWith("ERROR"));
+ } catch (IOException socketMayBeClosedFirstByBroker) {}
}
@Test(timeout = 60000)