You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2009/10/24 15:48:32 UTC
svn commit: r829368 - in
/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server:
failover/MessageDisappearWithIOExceptionTest.java
security/acl/SimpleACLTest.java
Author: rgodfrey
Date: Sat Oct 24 13:48:32 2009
New Revision: 829368
URL: http://svn.apache.org/viewvc?rev=829368&view=rev
Log:
merge fixes
Modified:
qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java?rev=829368&r1=829367&r2=829368&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java Sat Oct 24 13:48:32 2009
@@ -201,11 +201,6 @@
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
Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java?rev=829368&r1=829367&r2=829368&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java Sat Oct 24 13:48:32 2009
@@ -873,7 +873,12 @@
{
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());
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org