From 059f79ddbc64283ac4f65dd34b9c0044dec69e02 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sat, 24 Oct 2009 13:48:32 +0000 Subject: merge fixes git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-0-10@829368 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/failover/MessageDisappearWithIOExceptionTest.java | 5 ----- .../java/org/apache/qpid/server/security/acl/SimpleACLTest.java | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java index e507ebc534..863aa43d22 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java @@ -201,11 +201,6 @@ public class MessageDisappearWithIOExceptionTest extends FailoverBaseCase implem assertTrue("Failover did not occur", _failoverOccured.await(4000, TimeUnit.MILLISECONDS)); - //Verify new protocolSession is not the same as the original - assertNotSame("Protocol Session has not changed", - protocolSession, - _connection.getProtocolHandler().getProtocolSession()); - /***********************************/ // This verifies that the bug has been resolved diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java index dde235f73e..9487f72ac8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java @@ -873,7 +873,12 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener { Throwable cause = e.getLinkedException(); - if (!(cause instanceof AMQAuthenticationException)) + if (cause == null) + { + e.printStackTrace(System.out); + fail("JMS Exception did not have cause"); + } + else if (!(cause instanceof AMQAuthenticationException)) { cause.printStackTrace(System.out); assertEquals("Incorrect exception", IllegalStateException.class, cause.getClass()); -- cgit v1.2.1