summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2011-12-26 18:59:48 +0000
committerKeith Wall <kwall@apache.org>2011-12-26 18:59:48 +0000
commiteb54a4e9a63e20c6af0360f7e1ce3d208f89bcc0 (patch)
tree2d37a206e22404f6d283ebe2088f58108d5da592 /qpid/java
parent2a6647a3afe5993bcc642bf2c9d80691d331cd49 (diff)
downloadqpid-python-eb54a4e9a63e20c6af0360f7e1ce3d208f89bcc0.tar.gz
QPID-3712: Correct QpidBrokerTestCase#isExternalBroker logic to correct return true when testing with externally spawned Brokers.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1224789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java4
1 files changed, 2 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 14b9bacad4..f680a20288 100644
--- 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
@@ -945,7 +945,7 @@ public class QpidBrokerTestCase extends QpidTestCase
protected boolean isJavaBroker()
{
- return _brokerLanguage.equals("java") || _brokerType.equals("vm");
+ return _brokerLanguage.equals("java");
}
protected boolean isCppBroker()
@@ -955,7 +955,7 @@ public class QpidBrokerTestCase extends QpidTestCase
protected boolean isExternalBroker()
{
- return !_brokerType.equals("vm"); //TODO
+ return !isInternalBroker();
}
protected boolean isInternalBroker()