You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ru...@apache.org on 2007/05/22 16:08:03 UTC
svn commit: r540590 - in
/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server:
exception/UnknownXidException.java messageStore/JDBCStore.java
txn/JDBCTransactionManager.java txn/MemoryTransactionManager.java
Author: rupertlssmith
Date: Tue May 22 07:08:02 2007
New Revision: 540590
URL: http://svn.apache.org/viewvc?view=rev&rev=540590
Log:
All exceptions now have one contructor. Some multiple cons left in as deprecated, will eliminate in a week or so.
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java?view=diff&rev=540590&r1=540589&r2=540590
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exception/UnknownXidException.java Tue May 22 07:08:02 2007
@@ -50,8 +50,6 @@
*
* @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 @@
*
* @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 @@
* @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)
{
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java?view=diff&rev=540590&r1=540589&r2=540590
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/messageStore/JDBCStore.java Tue May 22 07:08:02 2007
@@ -1107,7 +1107,7 @@
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 @@
JDBCTransaction tx = getTx(xid);
if (tx == null)
{
- throw new UnknownXidException(xid);
+ throw new UnknownXidException(xid, null);
}
updateQueueMessageRelation(tx.getConnection(), queue.getQueueID(), m.getMessageId(), 0);
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java?view=diff&rev=540590&r1=540589&r2=540590
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JDBCTransactionManager.java Tue May 22 07:08:02 2007
@@ -524,7 +524,7 @@
Transaction tx = _xidMap.get(xid);
if (tx == null)
{
- throw new UnknownXidException(xid);
+ throw new UnknownXidException(xid, null);
}
return (JDBCTransaction) tx;
}
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java?view=diff&rev=540590&r1=540589&r2=540590
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/MemoryTransactionManager.java Tue May 22 07:08:02 2007
@@ -19,13 +19,9 @@
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 @@
}
catch (InvalidXidException e)
{
- throw new UnknownXidException(xid, e.getMessage(), e);
+ throw new UnknownXidException(xid, e);
}
catch (Exception e)
{
@@ -246,7 +242,7 @@
}
catch (InvalidXidException e)
{
- throw new UnknownXidException(xid, e.getMessage(), e);
+ throw new UnknownXidException(xid, e);
}
catch (Exception e)
{
@@ -317,7 +313,7 @@
Transaction tx = _xidMap.get(xid);
if (tx == null)
{
- throw new UnknownXidException(xid, "", null);
+ throw new UnknownXidException(xid, null);
}
return tx;