summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/main
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2011-06-26 13:55:11 +0000
committerRobert Gemmell <robbie@apache.org>2011-06-26 13:55:11 +0000
commit205003bbf28de2c64a85cd47aa1a0e9d245885d3 (patch)
tree9a3c36ffc4d8832ff0fae01b7d1d1eec69058259 /qpid/java/broker/src/main
parent4edfb54cabefeba396f8e326fd22ce55854ac406 (diff)
downloadqpid-python-205003bbf28de2c64a85cd47aa1a0e9d245885d3.tar.gz
QPID-3318: ensure the abstract HouseKeepingTask class removes the LogActor it adds to the stack
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1139793 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
index 2db1944cd1..ebace95f65 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
@@ -63,6 +63,10 @@ public abstract class HouseKeepingTask implements Runnable
{
_logger.warn(this.getClass().getSimpleName() + " throw exception: " + e, e);
}
+ finally
+ {
+ CurrentActor.remove();
+ }
}
public VirtualHost getVirtualHost()