isConnected checks that QMUX is in running state

diegomaye · Aug 6, 2014 · df69a8c · df69a8c
1 parent 42b1f03
commit df69a8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/jpos/src/main/java/org/jpos/q2/iso/QMUX.java b/jpos/src/main/java/org/jpos/q2/iso/QMUX.java
@@ -371,14 +371,13 @@ public void send(ISOMsg m) throws IOException, ISOException {
     }
 
     public boolean isConnected() {
-        if (ready != null && ready.length > 0) {
+        if (running() && ready != null && ready.length > 0) {
             for (String aReady : ready)
                 if (sp.rdp(aReady) != null)
                     return true;
             return false;
         }
-        else
-            return true;
+        return running();
     }
     public void dump (PrintStream p, String indent) {
         p.println (indent + getCountersAsString());

diff --git a/jpos/src/test/java/org/jpos/q2/iso/QMUXTest.java b/jpos/src/test/java/org/jpos/q2/iso/QMUXTest.java
@@ -114,8 +114,7 @@ public void testInitServiceThrowsNullPointerException2() throws Throwable {
 
     @Test
     public void testIsConnected() throws Throwable {
-        boolean result = new QMUX().isConnected();
-        assertTrue("result", result);
+        assertFalse("result", new QMUX().isConnected()); // MUX was not started
     }
 
     @Test