[jboss-svn-commits] JBL Code SVN: r38119 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171: ArjunaJTA and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 7 10:18:38 EDT 2012
Author: jolee
Date: 2012-06-07 10:18:36 -0400 (Thu, 07 Jun 2012)
New Revision: 38119
Modified:
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171/
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171/ArjunaJTA/
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
Log:
JBPAPP-9125
Property changes on: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171
___________________________________________________________________
Added: svn:mergeinfo
+ /labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP:38099
Property changes on: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171/ArjunaJTA
___________________________________________________________________
Modified: svn:mergeinfo
- /labs/jbosstm/trunk/ArjunaJTA:36765
+ /labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA:38099
/labs/jbosstm/trunk/ArjunaJTA:36765
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2012-06-07 13:34:25 UTC (rev 38118)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP12_JBTM-1171/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2012-06-07 14:18:36 UTC (rev 38119)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * full listing of individual contributors.
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public License,
* v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -97,7 +97,7 @@
* The params represent specific parameters we need to recreate the
* connection to the database in the event of a failure. If they're not set
* then recovery is out of our control.
- *
+ *
* Could also use it to pass other information, such as the readonly flag.
*/
@@ -113,7 +113,7 @@
com.arjuna.ats.jta.logging.FacilityCode.FAC_JTA,
"XAResourceRecord.XAResourceRecord ( " + xid + " )");
}
-
+
_theXAResource = res;
_recoveryObject = null;
_tranID = xid;
@@ -268,7 +268,7 @@
// we won't be called again, so we need to tidy up now
removeConnection();
}
-
+
return TwoPhaseOutcome.PREPARE_READONLY;
}
else
@@ -283,7 +283,7 @@
"com.arjuna.ats.internal.jta.resources.arjunacore.preparefailed",
new Object[]
{ "XAResourceRecord.prepare",
- XAHelper.printXAErrorCode(e1) });
+ XAHelper.printXAErrorCode(e1) }, e1);
}
/*
@@ -363,7 +363,7 @@
return TwoPhaseOutcome.FINISH_OK;
}
-
+
if (_tranID == null)
{
if (jtaLogger.loggerI18N.isWarnEnabled())
@@ -410,11 +410,11 @@
else
{
removeConnection();
-
+
return TwoPhaseOutcome.FINISH_ERROR;
}
}
-
+
try
{
_theXAResource.rollback(_tranID);
@@ -562,7 +562,7 @@
* No need for end call here since we can only get to this
* point by going through prepare.
*/
-
+
try
{
_theXAResource.commit(_tranID, false);
@@ -640,7 +640,7 @@
.warn("com.arjuna.ats.internal.jta.resources.arjunacore.commitexception",
new Object[] { "XAResourceRecord.topLevelCommit", e2 }, e2);
}
-
+
return TwoPhaseOutcome.FINISH_ERROR;
}
finally
@@ -698,7 +698,7 @@
* outcome is whatever we want. Therefore, we do not need to save any
* additional recoverable state, such as a reference to the transaction
* coordinator, since it will not have an intentions list anyway.
- *
+ *
* @message com.arjuna.ats.internal.jta.resources.arjunacore.opcnulltx
* [com.arjuna.ats.internal.jta.resources.arjunacore.opcnulltx] {0} -
* null transaction!
@@ -739,7 +739,7 @@
boolean commit = true;
XAException endHeuristic = null;
-
+
try
{
/*
@@ -753,7 +753,7 @@
}
}
catch (XAException e1)
- {
+ {
/*
* Now it's not legal to return a heuristic from end, but
* apparently Oracle does (http://jira.jboss.com/jira/browse/JBTM-343)
@@ -781,7 +781,7 @@
* Has been marked as rollback-only. We still
* need to call rollback.
*/
-
+
commit = false;
break;
case XAException.XAER_RMERR:
@@ -796,17 +796,17 @@
}
}
}
-
+
try
{
/*
* Not strictly necessary since calling commit will
* do the rollback if end failed as above.
*/
-
+
if (endHeuristic != null) // catch those RMs that terminate in end rather than follow the spec
throw endHeuristic;
-
+
if (commit)
_theXAResource.commit(_tranID, true);
else
@@ -971,12 +971,12 @@
{
ByteArrayOutputStream s = new ByteArrayOutputStream();
ObjectOutputStream o = new ObjectOutputStream(s);
-
+
o.writeObject(_theXAResource);
o.close();
-
+
os.packBoolean(true);
-
+
os.packBytes(s.toByteArray());
}
catch (NotSerializableException ex)
@@ -986,14 +986,14 @@
jtaLogger.loggerI18N
.warn("com.arjuna.ats.internal.jta.resources.arjunacore.savestate");
}
-
+
return false;
}
}
else
{
// have to rely upon XAResource.recover!
-
+
os.packBoolean(false);
}
}
@@ -1104,7 +1104,7 @@
* other participants that can still recover. Plus, we will
* try to get a new XAResource later for this instance.
*/
-
+
res = true;
}
}
More information about the jboss-svn-commits
mailing list