diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2012-07-30 21:18:12 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2012-07-30 21:18:12 +0000 |
| commit | 63d62f8263e46ac4ce22885d82b5c2ab1e09d2de (patch) | |
| tree | 973e3acce74ebaf85c11599e278bfd98419c1473 | |
| parent | eed0c3d16613998b02d324abe2abfb713113c261 (diff) | |
| download | qpid-python-63d62f8263e46ac4ce22885d82b5c2ab1e09d2de.tar.gz | |
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)
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1367308 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java | 5 | ||||
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java index 3deddbd918..2402c06f7f 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java +++ b/qpid/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/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java index 2c7f426306..626592dc10 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java +++ b/qpid/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 |