qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject svn commit: r1367308 - in /qpid/branches/0.18/qpid/java: client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
Date Mon, 30 Jul 2012 21:18:12 GMT
Author: rajith
Date: Mon Jul 30 21:18:12 2012
New Revision: 1367308

URL: http://svn.apache.org/viewvc?rev=1367308&view=rev
Log:
Porting to 0.18 branch.
QPID-3575
The added a system prop to revert to the previous behavior if need be.
Modified the SelectorTest#testRuntimeSelectorError test case to suit the
new behavior.

(cherry picked from commit 1b11ea556b73c4374a1c93d8707dc9aa57b209e1)

Modified:
    qpid/branches/0.18/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
    qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java

Modified: qpid/branches/0.18/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=1367308&r1=1367307&r2=1367308&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
(original)
+++ qpid/branches/0.18/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
Mon Jul 30 21:18:12 2012
@@ -128,7 +128,8 @@ public class AMQSession_0_10 extends AMQ
      * Used to store the range of in tx messages
      */
     private final RangeSet _txRangeSet = RangeSetFactory.createRangeSet();
-    private int _txSize = 0;    
+    private int _txSize = 0;
+    private boolean _isHardError = Boolean.getBoolean("qpid.session.is_hard_error");
     //--- constructors
 
     /**
@@ -1047,7 +1048,7 @@ public class AMQSession_0_10 extends AMQ
             {
                 code = ee.getErrorCode().getValue();
             }
-            AMQException amqe = new AMQException(AMQConstant.getConstant(code), false, se.getMessage(),
se.getCause());
+            AMQException amqe = new AMQException(AMQConstant.getConstant(code), _isHardError,
se.getMessage(), se.getCause());
             _currentException = amqe;
         }
         cancelTimerTask();

Modified: qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java?rev=1367308&r1=1367307&r2=1367308&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
(original)
+++ qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
Mon Jul 30 21:18:12 2012
@@ -233,7 +233,7 @@ public class SelectorTest extends QpidBr
         {
             
         }
-        assertTrue("Connection should be closed", _connection.isClosed());
+        assertFalse("Connection should not be closed", _connection.isClosed());
     }
         
     public void testSelectorWithJMSMessageID() throws Exception



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message