From 2e440c8053ce45b8a28a74dc4c83a5e0112a0948 Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Wed, 23 Apr 2008 14:33:54 +0000
Subject: QPID-832 fix failover detection, rename startDispatcher

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@650890 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/client/AMQSession.java   | 14 +++++++++-----
 .../java/org/apache/qpid/client/BasicMessageConsumer.java  |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index ce1646e39c..404c0cd381 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -516,6 +516,10 @@ public abstract class AMQSession extends Closeable implements Session, QueueSess
         if (isClosed())
         {
             throw new IllegalStateException("Session is already closed");
+        } 
+        else if (hasFailedOver())
+        {
+            throw new IllegalStateException("has failed over");
         }
 
         while (true)
@@ -771,7 +775,7 @@ public abstract class AMQSession extends Closeable implements Session, QueueSess
                 else
                 {
                     _logger.info("Dispatcher is null so created stopped dispatcher");
-                    startDistpatcherIfNecessary(true);
+                    startDispatcherIfNecessary(true);
                 }
 
                 _dispatcher.rejectPending(consumer);
@@ -1800,11 +1804,11 @@ public abstract class AMQSession extends Closeable implements Session, QueueSess
         // If the event dispatcher is not running then start it too.
         if (hasMessageListeners())
         {
-            startDistpatcherIfNecessary();
+            startDispatcherIfNecessary();
         }
     }
 
-    void startDistpatcherIfNecessary()
+    void startDispatcherIfNecessary()
     {
         //If we are the dispatcher then we don't need to check we are started
         if (Thread.currentThread() == _dispatcher)
@@ -1830,10 +1834,10 @@ public abstract class AMQSession extends Closeable implements Session, QueueSess
             }
         }
 
-        startDistpatcherIfNecessary(false);
+        startDispatcherIfNecessary(false);
     }
 
-    synchronized void startDistpatcherIfNecessary(boolean initiallyStopped)
+    synchronized void startDispatcherIfNecessary(boolean initiallyStopped)
     {
         if (_dispatcher == null)
         {
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index e7c607d95a..1741903bb8 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
@@ -277,7 +277,7 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
                 {
                     _messageListener.set(messageListener);
                     _session.setHasMessageListeners();
-                    _session.startDistpatcherIfNecessary();
+                    _session.startDispatcherIfNecessary();
                 }
             }
         }
@@ -393,7 +393,7 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
             }
         }
 
-        _session.startDistpatcherIfNecessary();
+        _session.startDispatcherIfNecessary();
 
         try
         {
@@ -460,7 +460,7 @@ public abstract class BasicMessageConsumer<H, B> extends Closeable implements Me
             return null;
         }
 
-        _session.startDistpatcherIfNecessary();
+        _session.startDispatcherIfNecessary();
 
         try
         {
-- 
cgit v1.2.1