You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/06/27 11:00:40 UTC
svn commit: r1750321 -
/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
Author: orudyy
Date: Mon Jun 27 11:00:40 2016
New Revision: 1750321
URL: http://svn.apache.org/viewvc?rev=1750321&view=rev
Log:
NO-JIRA: Stop checking ports for already shutdown internal broker
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java?rev=1750321&r1=1750320&r2=1750321&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java Mon Jun 27 11:00:40 2016
@@ -87,30 +87,35 @@ public class InternalBrokerHolder extend
@Override
public void shutdown()
{
- LOGGER.info("Shutting down Broker instance");
-
- Subject.doAs(SecurityManager.getSystemTaskSubject("Shutdown"), new PrivilegedAction<Object>()
+ if (_broker != null)
{
- @Override
- public Object run()
+ LOGGER.info("Shutting down Broker instance");
+
+ Subject.doAs(SecurityManager.getSystemTaskSubject("Shutdown"), new PrivilegedAction<Object>()
{
- if (_broker != null)
+ @Override
+ public Object run()
{
- _broker.shutdown();
+ if (_broker != null)
+ {
+ _broker.shutdown();
+ }
+ return null;
}
- return null;
- }
-
-
- });
- waitUntilPortsAreFree();
+ });
+ waitUntilPortsAreFree();
+ LOGGER.info("Broker instance shutdown");
+ }
+ else
+ {
+ LOGGER.info("Nothing to shutdown. Broker instance either was already shut down or not started at all.");
+ }
if (UNCAUGHT_EXCEPTION_HANDLER.getAndResetCount() > 0)
{
throw new RuntimeException(
"One or more uncaught exceptions occurred prior to end of this test. Check test logs.");
}
- LOGGER.info("Broker instance shutdown");
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org