From 37fc58fefd1954d9738840513783fcf12b963982 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 21 Aug 2012 00:50:20 +0800 Subject: [PATCH] xa support --- .../alibaba/druid/pool/xa/DruidXAOracleResource.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/xa/DruidXAOracleResource.java b/src/main/java/com/alibaba/druid/pool/xa/DruidXAOracleResource.java index 859c4fee5e..2f7acdbe3d 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/DruidXAOracleResource.java +++ b/src/main/java/com/alibaba/druid/pool/xa/DruidXAOracleResource.java @@ -12,8 +12,6 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import oracle.jdbc.internal.OracleConnection; -import oracle.jdbc.xa.OracleXAException; -import oracle.jdbc.xa.OracleXAResource; import com.alibaba.druid.util.OracleUtils; @@ -274,8 +272,8 @@ public class DruidXAOracleResource extends DruidXAResource { @Override public boolean isSameRM(XAResource xares) throws XAException { Connection conn1 = null; - if ((xares instanceof OracleXAResource)) { - conn1 = ((OracleXAResource) xares).getConnection(); + if ((xares instanceof DruidXAOracleResource)) { + conn1 = ((DruidXAOracleResource) xares).getConnection(); } else { return false; } @@ -316,7 +314,7 @@ public class DruidXAOracleResource extends DruidXAResource { returnVal = doPrepare(xid); if ((returnVal != 0) && (returnVal != 3)) { - int x_e = OracleXAException.errorConvert(returnVal); + int x_e = DruidXAOracleException.errorConvert(returnVal); if ((x_e != 0) && (x_e != 3)) { XAException ex = DruidXAOracleException.newXAException(getConnectionDuringExceptionHandling(), @@ -391,6 +389,10 @@ public class DruidXAOracleResource extends DruidXAResource { return (OracleConnection) this.connection; } + public Connection getConnection() { + return this.connection; + } + @Override public Xid[] recover(int flag) throws XAException { synchronized (this.connection) {