diff options
Diffstat (limited to 'qpid/java')
2 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java index 96cf2d9b70..9c1d302be0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java @@ -465,7 +465,7 @@ public class AbstractTestLogging extends QpidBrokerTestCase System.err.println(log); } - if (results.size() == 0 && monitor != null) + if (results.isEmpty() && monitor != null) { System.err.println("Monitored file contents:"); System.err.println(monitor.readFile()); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java index 6868f82ed9..7ab937b15f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java @@ -219,10 +219,10 @@ public class ManagementLoggingTest extends AbstractTestLogging validateMessageID("MNG-1002", log); // We expect the RMI Registry port (the defined 'management port') to be - // 100 lower than the RMIConnector Server Port (the actual JMX server) - mPort = getPort() + (DEFAULT_MANAGEMENT_PORT - DEFAULT_PORT) + 100; - assertTrue("RMI ConnectorServer port not as expected(" + mPort + ").:" + getMessageString(log), - getMessageString(log).endsWith(String.valueOf(mPort))); + // 100 lower than the JMX RMIConnector Server Port (the actual JMX server) + int jmxPort = mPort + 100; + assertTrue("JMX RMIConnectorServer port not as expected(" + jmxPort + ").:" + getMessageString(log), + getMessageString(log).endsWith(String.valueOf(jmxPort))); } catch (AssertionFailedError afe) { |