You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/03/11 15:47:03 UTC
svn commit: r1080584 - in /jackrabbit/branches/2.2: ./
jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/
Author: jukka
Date: Fri Mar 11 14:47:03 2011
New Revision: 1080584
URL: http://svn.apache.org/viewvc?rev=1080584&view=rev
Log:
2.2: Merged revision 1074140 (JCR-2901)
Modified:
jackrabbit/branches/2.2/ (props changed)
jackrabbit/branches/2.2/RELEASE-NOTES.txt
jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnection.java
jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnectionFactory.java
jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/TransactionBoundXAResource.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 14:47:03 2011
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1079314,1079317
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317
Modified: jackrabbit/branches/2.2/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/RELEASE-NOTES.txt?rev=1080584&r1=1080583&r2=1080584&view=diff
==============================================================================
--- jackrabbit/branches/2.2/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/2.2/RELEASE-NOTES.txt Fri Mar 11 14:47:03 2011
@@ -20,6 +20,8 @@ Bug fixes
[JCR-2889] Occasional JCA test failures
[JCR-2891] VersionManagerImplRestore internalRestoreFrozen method has ...
[JCR-2900] DbClusterTest failure due to network configuration
+ [JCR-2901] JCR-2523 break the transaction handling in container ...
+ [JCR-2904] Uncaught AbstractMethodError exception in in DomUtil....
For more detailed information about all the changes in this and other
Jackrabbit releases, please see the Jackrabbit issue tracker at
Modified: jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnection.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnection.java?rev=1080584&r1=1080583&r2=1080584&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnection.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnection.java Fri Mar 11 14:47:03 2011
@@ -57,7 +57,7 @@ public final class JCAManagedConnection
/**
* XAResource instance.
*/
- private final XAResource xaResource;
+ private XAResource xaResource;
/**
* Listeners.
@@ -156,8 +156,8 @@ public final class JCAManagedConnection
*/
public void destroy()
throws ResourceException {
- cleanup();
- session.logout();
+ this.session.logout();
+ this.handles.clear();
}
/**
@@ -170,6 +170,11 @@ public final class JCAManagedConnection
this.session.logout();
this.session = openSession();
this.handles.clear();
+ if (this.mcf.getBindSessionToTransaction().booleanValue() && (this.xaResource instanceof TransactionBoundXAResource)) {
+ ((TransactionBoundXAResource) this.xaResource).rebind((XAResource) session);
+ } else {
+ this.xaResource = (XAResource) session;
+ }
}
}
Modified: jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnectionFactory.java?rev=1080584&r1=1080583&r2=1080584&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnectionFactory.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCAManagedConnectionFactory.java Fri Mar 11 14:47:03 2011
@@ -45,7 +45,7 @@ public final class JCAManagedConnectionF
/**
* Flag indicating whether the session should be bound to the
- * transaction lyfecyle.
+ * transaction lifecycle.
* In other words, if this flag is true the handle
* will be closed when the transaction ends.
*/
Modified: jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/TransactionBoundXAResource.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/TransactionBoundXAResource.java?rev=1080584&r1=1080583&r2=1080584&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/TransactionBoundXAResource.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/TransactionBoundXAResource.java Fri Mar 11 14:47:03 2011
@@ -34,6 +34,16 @@ public class TransactionBoundXAResource
this.xaResource = xaResource;
this.connection = connection;
}
+
+ /**
+ * There is a one-to-one Relation between this TransactionBoundXAResource
+ * and the JCAManagedConnection so the used XAResource must be in sync when it is changed in the
+ * JCAManagedConnection.
+ * @param res
+ */
+ protected void rebind(XAResource res) {
+ this.xaResource = res;
+ }
public void commit(Xid arg0, boolean arg1) throws XAException {
xaResource.commit(arg0, arg1);