diff options
author | Robert Gemmell <robbie@apache.org> | 2011-04-22 15:15:46 +0000 |
---|---|---|
committer | Robert Gemmell <robbie@apache.org> | 2011-04-22 15:15:46 +0000 |
commit | 7b72bf31f73a810ccca6a9c8f6bc4e9730017934 (patch) | |
tree | f2f5457971e5a91dfe12e45923107311f368fede | |
parent | 1b0f39f46f8152379d60dca6352368ddd734e728 (diff) | |
download | qpid-python-7b72bf31f73a810ccca6a9c8f6bc4e9730017934.tar.gz |
QPID-2985: remove duplicate logic to begin store transaction, which seems to have been merged back into place after a previous removal
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1095942 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-x | qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java | 12 | ||||
-rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java index f9dac782a6..946dbd7c28 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java @@ -213,18 +213,6 @@ public class LocalTransaction implements ServerTransaction if(message.isPersistent()) { - if(_transaction == null) - { - for(BaseQueue queue : queues) - { - if(queue.isDurable()) - { - beginTranIfNecessary(); - break; - } - } - } - try { for(BaseQueue queue : queues) diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java index 5374a56f06..8ce4121b97 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java @@ -299,7 +299,7 @@ public class VirtualHostImpl implements VirtualHost _configuration.getTransactionTimeoutOpenClose(), _configuration.getTransactionTimeoutIdleWarn(), _configuration.getTransactionTimeoutIdleClose()); - } + } catch (Exception e) { _logger.error("Exception in housekeeping for connection: " + connection.toString(), e); |