diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-07-16 12:40:04 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-07-16 12:40:04 +0000 |
| commit | c33a0a69945a04a3cdcc430c2415a8d4dde1fdf0 (patch) | |
| tree | 0664c7a8b288632cae291e398a5bb79cfd28fc7b | |
| parent | f5dbd7ef472ebd8278059cfca171667b66b2d64c (diff) | |
| download | qpid-python-c33a0a69945a04a3cdcc430c2415a8d4dde1fdf0.tar.gz | |
Renamed shutdownServer to restartBroker as that is what is does
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@677262 13f79535-47bb-0310-9956-ffa450edef68
4 files changed, 9 insertions, 9 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java index 34fbd9532f..19b73fcc7c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java @@ -67,7 +67,7 @@ public class DurableSubscriberTest extends QpidTestCase //now stop the server try { - shutdownServer(); + restartBroker(); } catch (Exception e) { @@ -117,7 +117,7 @@ public class DurableSubscriberTest extends QpidTestCase //now stop the server try { - shutdownServer(); + restartBroker(); } catch (Exception e) { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java index 740f9e72ad..d2abc0eac1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java @@ -372,7 +372,7 @@ public class QueueTest extends AbstractXATestCase try { _logger.debug("stopping broker"); - shutdownServer(); + restartBroker(); init(); } catch (Exception e) @@ -561,7 +561,7 @@ public class QueueTest extends AbstractXATestCase try { _logger.debug("stopping broker"); - shutdownServer(); + restartBroker(); init(); } catch (Exception e) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java index 027257d761..99d0f0a075 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java @@ -829,7 +829,7 @@ public class TopicTest extends AbstractXATestCase /////// stop the broker now !! try { - shutdownServer(); + restartBroker(); init(); } catch (Exception e) @@ -1110,7 +1110,7 @@ public class TopicTest extends AbstractXATestCase /////// stop the server now !! try { - shutdownServer(); + restartBroker(); init(); } catch (Exception e) @@ -1288,7 +1288,7 @@ public class TopicTest extends AbstractXATestCase /////// stop the server now !! try { - shutdownServer(); + restartBroker(); init(); } catch (Exception e) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 9b879c14d1..0b41c5040c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -356,7 +356,7 @@ public class QpidTestCase extends TestCase return _brokerVersion.equals(VERSION_010); } - public void shutdownServer() throws Exception + public void restartBroker() throws Exception { stopBroker(); startBroker(); @@ -369,7 +369,7 @@ public class QpidTestCase extends TestCase * * @return an initial context * - * @throws Exception if there is an error getting the context + * @throws NamingException if there is an error getting the context */ public InitialContext getInitialContext() throws NamingException { |