diff options
Diffstat (limited to 'qpid/java/systests/src')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java | 8 | ||||
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java index 844e3ecc11..340ae4a1ae 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java @@ -49,9 +49,9 @@ public class SortedQueueTest extends QpidBrokerTestCase { private static final Logger LOGGER = Logger.getLogger(SortedQueueTest.class); public static final String TEST_SORT_KEY = "testSortKey"; - private static final String VALUES[] = SortedQueueEntryListTest.keys.clone(); - private static final String VALUES_SORTED[] = SortedQueueEntryListTest.keys.clone(); - public final static String SUBSET_KEYS[] = { "000", "100", "200", "300", "400", "500", "600", "700", "800", "900" }; + private static final String[] VALUES = SortedQueueEntryListTest.keys.clone(); + private static final String[] VALUES_SORTED = SortedQueueEntryListTest.keys.clone(); + private final String[] SUBSET_KEYS = { "000", "100", "200", "300", "400", "500", "600", "700", "800", "900" }; private Connection _producerConnection; private Session _producerSession; @@ -397,7 +397,7 @@ public class SortedQueueTest extends QpidBrokerTestCase } catch(Exception e) { - fail("Could not get connection"); + throw new RuntimeException("Could not get connection"); } final Session session = conn.createSession((_sessionType == Session.SESSION_TRANSACTED ? true : false), diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java index 4752aec352..507c994076 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java @@ -99,11 +99,11 @@ public class SpawnedBrokerHolder implements BrokerHolder { String processIdStr = line.substring(processIdOffset); processIdStr = processIdStr.substring(0, processIdStr.indexOf(' ')); - processIdStr.trim(); + processIdStr = processIdStr.trim(); String parentProcessIdStr = line.substring(parentProcessIdOffset); parentProcessIdStr = parentProcessIdStr.substring(0, parentProcessIdStr.indexOf(' ')); - parentProcessIdStr.trim(); + parentProcessIdStr = parentProcessIdStr.trim(); if(parentProcessIdStr.length() > 0 && (parentProcess == null || parentProcess.equals(parentProcessIdStr))) { List<String> children = parentProcessMap.get(parentProcessIdStr); |