diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:31:34 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-25 15:31:34 +0000 |
| commit | f9592e0d891b2eca8b91e06e6da0f8cd6c15f24c (patch) | |
| tree | c99af5d88f0e88eb52281efd9cf6ea2ded45c879 /qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | |
| parent | 9556a8d9c53be396a25cd4c29842b79e99bc1746 (diff) | |
| download | qpid-python-f9592e0d891b2eca8b91e06e6da0f8cd6c15f24c.tar.gz | |
Merging from trunk r1618840:1619054 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620349 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java')
| -rwxr-xr-x | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 0345485167..386cd80f38 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -550,8 +550,6 @@ public class QpidBrokerTestCase extends QpidTestCase // in to the external broker's QPID_OPTS string. setSystemProperty("amqj.protocol.logging.level"); setSystemProperty("root.logging.level"); - setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES); - setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES); setSystemProperty("test.port"); setSystemProperty("test.mport"); |