From 30ce8d7db74fd758fd4c3a3332b126855e3d059c Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Mon, 16 Jul 2012 17:41:02 +0000
Subject: 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.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1362162 13f79535-47bb-0310-9956-ffa450edef68
---
 .../client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java | 5 +++--
 .../main/java/org/apache/qpid/test/client/message/SelectorTest.java  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'java')

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 3deddbd918..2402c06f7f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -128,7 +128,8 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
      * 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 AMQSession<BasicMessageConsumer_0_10, Basic
             {
                 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();
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
index 2c7f426306..626592dc10 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
@@ -233,7 +233,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
         {
             
         }
-        assertTrue("Connection should be closed", _connection.isClosed());
+        assertFalse("Connection should not be closed", _connection.isClosed());
     }
         
     public void testSelectorWithJMSMessageID() throws Exception
-- 
cgit v1.2.1