diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-14 19:23:14 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-14 19:23:14 +0000 |
| commit | e31aa33452bd54ce118078ad38d8291cc3a3d1db (patch) | |
| tree | 208074a516facfe5db4f0e45239a071755427cbe /java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java | |
| parent | 4487d5b68a5d91abf66406bdc730806d70f1c325 (diff) | |
| download | qpid-python-e31aa33452bd54ce118078ad38d8291cc3a3d1db.tar.gz | |
Merged from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-amqp-1-0-management@1568495 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java')
| -rw-r--r-- | java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java index 87a02b99c1..0e6b4d3b08 100644 --- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java +++ b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java @@ -41,8 +41,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import javax.security.auth.Subject; -import org.apache.qpid.AMQException; -import org.apache.qpid.AMQStoreException; +import org.apache.qpid.server.store.StoreException; import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.server.TransactionTimeoutHelper; import org.apache.qpid.server.TransactionTimeoutHelper.CloseAction; @@ -148,7 +147,7 @@ public class ServerSession extends Session _transactionTimeoutHelper = new TransactionTimeoutHelper(_logSubject, new CloseAction() { @Override - public void doTimeoutAction(String reason) throws AMQException + public void doTimeoutAction(String reason) { getConnectionModel().closeSession(ServerSession.this, AMQConstant.RESOURCE_ERROR, reason); } @@ -493,14 +492,14 @@ public class ServerSession extends Session public void prepareDtx(Xid xid) throws UnknownDtxBranchException, - IncorrectDtxStateException, AMQStoreException, RollbackOnlyDtxException, TimeoutDtxException + IncorrectDtxStateException, StoreException, RollbackOnlyDtxException, TimeoutDtxException { getVirtualHost().getDtxRegistry().prepare(xid); } public void commitDtx(Xid xid, boolean onePhase) throws UnknownDtxBranchException, - IncorrectDtxStateException, AMQStoreException, RollbackOnlyDtxException, TimeoutDtxException + IncorrectDtxStateException, StoreException, RollbackOnlyDtxException, TimeoutDtxException { getVirtualHost().getDtxRegistry().commit(xid, onePhase); } @@ -508,7 +507,7 @@ public class ServerSession extends Session public void rollbackDtx(Xid xid) throws UnknownDtxBranchException, - IncorrectDtxStateException, AMQStoreException, TimeoutDtxException + IncorrectDtxStateException, StoreException, TimeoutDtxException { getVirtualHost().getDtxRegistry().rollback(xid); } @@ -679,7 +678,7 @@ public class ServerSession extends Session return (LogSubject) this; } - public void checkTransactionStatus(long openWarn, long openClose, long idleWarn, long idleClose) throws AMQException + public void checkTransactionStatus(long openWarn, long openClose, long idleWarn, long idleClose) { _transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, openWarn, openClose, idleWarn, idleClose); } |