ozeigermann 2004/07/22 11:41:59
Modified: src/stores/org/apache/slide/store/impl/rdbms
AbstractRDBMSStore.java
src/share/org/apache/slide/common XAServiceBase.java
Log:
Adapted to modified TransactionalResource interface.
Revision Changes Path
1.8 +12 -23
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/AbstractRDBMSStore.java
Index: AbstractRDBMSStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/AbstractRDBMSStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractRDBMSStore.java 19 Jul 2004 11:02:03 -0000 1.7
+++ AbstractRDBMSStore.java 22 Jul 2004 18:41:59 -0000 1.8
@@ -33,6 +33,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.apache.commons.transaction.util.xa.AbstractTransactionalResource;
import org.apache.commons.transaction.util.xa.TransactionalResource;
import org.apache.slide.common.AbstractXAService;
import org.apache.slide.common.AbstractXAServiceBase;
@@ -825,13 +826,13 @@
return new TransactionId(xid);
}
- private class TransactionId implements TransactionalResource {
+ private class TransactionId extends AbstractTransactionalResource {
Xid xid;
int status;
Connection connection;
TransactionId(Xid xid) throws SQLException {
- this.xid = xid;
+ super(xid);
status = STATUS_ACTIVE;
connection = getNewConnection();
@@ -874,26 +875,14 @@
return XA_OK;
}
- public void close() throws XAException {
- try {
- connection.close();
- } catch (SQLException e) {
- getLogger().log(e, LOG_CHANNEL, Logger.WARNING);
- // do not report, but gracefully ignore
- }
- }
-
- public int getStatus() {
- return status;
+ public void begin() throws XAException {
}
-
- public void setStatus(int status) {
- this.status = status;
+
+ public void suspend() throws XAException {
}
- public Xid getXid() {
- return xid;
- }
+ public void resume() throws XAException {
+ }
}
1.3 +13 -7
jakarta-slide/src/share/org/apache/slide/common/XAServiceBase.java
Index: XAServiceBase.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/XAServiceBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XAServiceBase.java 19 Jul 2004 11:02:02 -0000 1.2
+++ XAServiceBase.java 22 Jul 2004 18:41:59 -0000 1.3
@@ -105,9 +105,6 @@
return XA_OK;
}
- public void close() throws XAException {
- }
-
public int getStatus() {
return status;
}
@@ -119,6 +116,15 @@
public Xid getXid() {
return xid;
}
+
+ public void begin() throws XAException {
+ }
+
+ public void suspend() throws XAException {
+ }
+
+ public void resume() throws XAException {
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
