diff options
Diffstat (limited to 'java/broker')
4 files changed, 10 insertions, 14 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java b/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java index b8a8de90a0..e4a5de8ecb 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java +++ b/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java @@ -50,8 +50,6 @@ public class UnknownXidException extends Exception *
* @param xid The unknown xid.
* @param cause The casue for the xid to be unknown
- *
- * @deprecated
*/
public UnknownXidException(Xid xid, Throwable cause)
{
@@ -66,10 +64,10 @@ public class UnknownXidException extends Exception *
* @deprecated
*/
- public UnknownXidException(Xid xid, String reason)
+ /*public UnknownXidException(Xid xid, String reason)
{
super("The Xid: " + xid + " is unknown, The reason is: " + reason);
- }
+ }*/
/**
* Constructs a newr UnknownXidException with a reason message and cause
@@ -77,6 +75,8 @@ public class UnknownXidException extends Exception * @param reason The reason why the xid is unknown
* @param xid The unknown xid.
* @param cause The casue for the xid to be unknown
+ *
+ * @deprected
*/
public UnknownXidException(Xid xid, String reason, Throwable cause)
{
diff --git a/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java b/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java index 55d34fb2f0..e2d07c1c10 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java +++ b/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java @@ -1107,7 +1107,7 @@ public class JDBCStore implements MessageStore JDBCTransaction tx = getTx(xid); if (tx == null) { - throw new UnknownXidException(xid); + throw new UnknownXidException(xid, null); } updateQueueMessageRelation(tx.getConnection(), queue.getQueueID(), m.getMessageId(), 1); @@ -1121,7 +1121,7 @@ public class JDBCStore implements MessageStore JDBCTransaction tx = getTx(xid); if (tx == null) { - throw new UnknownXidException(xid); + throw new UnknownXidException(xid, null); } updateQueueMessageRelation(tx.getConnection(), queue.getQueueID(), m.getMessageId(), 0); } diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java b/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java index 0ea531630d..26ddbc881d 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java @@ -524,7 +524,7 @@ public class JDBCTransactionManager implements TransactionManager Transaction tx = _xidMap.get(xid); if (tx == null) { - throw new UnknownXidException(xid); + throw new UnknownXidException(xid, null); } return (JDBCTransaction) tx; } diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java b/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java index a361f85e2d..8b0d986d4b 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java @@ -19,13 +19,9 @@ package org.apache.qpid.server.txn; import java.util.HashMap; import java.util.Set; - import javax.transaction.xa.Xid; - import org.apache.commons.configuration.Configuration; - import org.apache.log4j.Logger; - import org.apache.qpid.server.exception.*; import org.apache.qpid.server.messageStore.MessageStore; @@ -199,7 +195,7 @@ public class MemoryTransactionManager implements TransactionManager } catch (InvalidXidException e) { - throw new UnknownXidException(xid, e.getMessage(), e); + throw new UnknownXidException(xid, e); } catch (Exception e) { @@ -246,7 +242,7 @@ public class MemoryTransactionManager implements TransactionManager } catch (InvalidXidException e) { - throw new UnknownXidException(xid, e.getMessage(), e); + throw new UnknownXidException(xid, e); } catch (Exception e) { @@ -317,7 +313,7 @@ public class MemoryTransactionManager implements TransactionManager Transaction tx = _xidMap.get(xid); if (tx == null) { - throw new UnknownXidException(xid, "", null); + throw new UnknownXidException(xid, null); } return tx; |