You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/03/10 15:37:54 UTC
svn commit: r921368 -
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
Author: robbie
Date: Wed Mar 10 14:37:53 2010
New Revision: 921368
URL: http://svn.apache.org/viewvc?rev=921368&view=rev
Log:
QPID-2379: ensure SubFlushRunner runnable changes thread name back to previous value, use corrects Logger for the class
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java?rev=921368&r1=921367&r2=921368&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java Wed Mar 10 14:37:53 2010
@@ -30,7 +30,7 @@ import org.apache.log4j.Logger;
class SubFlushRunner implements ReadWriteRunnable
{
- private static final Logger _logger = Logger.getLogger(SimpleAMQQueue.class);
+ private static final Logger _logger = Logger.getLogger(SubFlushRunner.class);
private final Subscription _sub;
@@ -46,29 +46,36 @@ class SubFlushRunner implements ReadWrit
public void run()
{
-
- Thread.currentThread().setName(_name);
-
- boolean complete = false;
+ String originalName = Thread.currentThread().getName();
try
{
- CurrentActor.set(_sub.getLogActor());
- complete = getQueue().flushSubscription(_sub, ITERATIONS);
+ Thread.currentThread().setName(_name);
+
+ boolean complete = false;
+ try
+ {
+ CurrentActor.set(_sub.getLogActor());
+ complete = getQueue().flushSubscription(_sub, ITERATIONS);
+
+ }
+ catch (AMQException e)
+ {
+ _logger.error(e);
+ }
+ finally
+ {
+ CurrentActor.remove();
+ }
+ if (!complete && !_sub.isSuspended())
+ {
+ getQueue().execute(this);
+ }
- }
- catch (AMQException e)
- {
- _logger.error(e);
}
finally
{
- CurrentActor.remove();
+ Thread.currentThread().setName(originalName);
}
- if (!complete && !_sub.isSuspended())
- {
- getQueue().execute(this);
- }
-
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org