Author: aidan
Date: Wed Apr 23 07:33:54 2008
New Revision: 650890
URL: http://svn.apache.org/viewvc?rev=650890&view=rev
Log:
QPID-832 fix failover detection, rename startDispatcher
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=650890&r1=650889&r2=650890&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Wed Apr 23 07:33:54 2008
@@ -516,6 +516,10 @@
if (isClosed())
{
throw new IllegalStateException("Session is already closed");
+ }
+ else if (hasFailedOver())
+ {
+ throw new IllegalStateException("has failed over");
}
while (true)
@@ -771,7 +775,7 @@
else
{
_logger.info("Dispatcher is null so created stopped
dispatcher");
- startDistpatcherIfNecessary(true);
+ startDispatcherIfNecessary(true);
}
_dispatcher.rejectPending(consumer);
@@ -1800,11 +1804,11 @@
// 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 @@
}
}
- startDistpatcherIfNecessary(false);
+ startDispatcherIfNecessary(false);
}
- synchronized void startDistpatcherIfNecessary(boolean initiallyStopped)
+ synchronized void startDispatcherIfNecessary(boolean initiallyStopped)
{
if (_dispatcher == null)
{
Modified:
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=650890&r1=650889&r2=650890&view=diff
==============================================================================
---
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
(original)
+++
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Wed Apr 23 07:33:54 2008
@@ -277,7 +277,7 @@
{
_messageListener.set(messageListener);
_session.setHasMessageListeners();
- _session.startDistpatcherIfNecessary();
+ _session.startDispatcherIfNecessary();
}
}
}
@@ -393,7 +393,7 @@
}
}
- _session.startDistpatcherIfNecessary();
+ _session.startDispatcherIfNecessary();
try
{
@@ -460,7 +460,7 @@
return null;
}
- _session.startDistpatcherIfNecessary();
+ _session.startDispatcherIfNecessary();
try
{
