From jboss-svn-commits at lists.jboss.org Thu Jun 25 10:54:30 2015 From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org) Date: Thu, 25 Jun 2015 10:54:30 -0400 Subject: [jboss-svn-commits] JBL Code SVN: r38451 - labs/jbosstm/branches. Message-ID: <201506251454.t5PEsU3S014277@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2015-06-25 10:54:29 -0400 (Thu, 25 Jun 2015) New Revision: 38451 Added: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ Log: JBPAPP-11225 - Backport of JBTM-692. From jboss-svn-commits at lists.jboss.org Mon Jun 29 05:24:24 2015 From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org) Date: Mon, 29 Jun 2015 05:24:24 -0400 Subject: [jboss-svn-commits] JBL Code SVN: r38452 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore and 1 other directories. Message-ID: <201506290924.t5T9OOcv003488@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2015-06-29 05:24:24 -0400 (Mon, 29 Jun 2015) New Revision: 38452 Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java Log: Back port of JBTM-692 Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2015-06-25 14:54:29 UTC (rev 38451) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2015-06-29 09:24:24 UTC (rev 38452) @@ -278,6 +278,8 @@ * @message com.arjuna.ats.arjuna.coordinator.BasicAction_71 * [com.arjuna.ats.arjuna.coordinator.BasicAction_71] - Deactivation of * atomic action with id {0} and type {1} unexpectedly failed + * @message com.arjuna.ats.arjuna.coordinator.norecordfound + * [com.arjuna.ats.arjuna.coordinator.norecordfound] - Could not recreate abstract record {0} */ public class BasicAction extends StateManager @@ -1479,10 +1481,13 @@ RecordType.typeToClassName(record_type), record_type, true); - res = (record.restore_state(os, ot) && heuristicList.insert(record)); + try { + + res = (record.restore_state(os, ot) && heuristicList.insert(record)); + record_type = os.unpackInt(); if (tsLogger.arjLoggerI18N.debugAllowed()) @@ -1495,6 +1500,13 @@ { res = false; } + catch (final NullPointerException ex) + { + if (tsLogger.arjLoggerI18N.isWarnEnabled()) + tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.norecordfound", new Object[] { record_type}); + + res = false; + } } } Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2015-06-25 14:54:29 UTC (rev 38451) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2015-06-29 09:24:24 UTC (rev 38452) @@ -621,12 +621,10 @@ return TwoPhaseOutcome.HEURISTIC_HAZARD; // something terminated the transaction! case XAException.XAER_PROTO: case XAException.XA_RETRY: + case XAException.XAER_RMFAIL: // resource manager failed, did it rollback? + _committed = true; return TwoPhaseOutcome.FINISH_ERROR; case XAException.XAER_INVAL: - case XAException.XAER_RMFAIL: // resource manager - // failed, did it - // rollback? - return TwoPhaseOutcome.HEURISTIC_HAZARD; default: return TwoPhaseOutcome.HEURISTIC_HAZARD; } @@ -844,6 +842,7 @@ return TwoPhaseOutcome.HEURISTIC_HAZARD; // something committed or rolled back without asking us! case XAException.XAER_PROTO: case XAException.XAER_INVAL: + return TwoPhaseOutcome.HEURISTIC_HAZARD; case XAException.XAER_RMFAIL: // resource manager failed, // did it rollback? return TwoPhaseOutcome.FINISH_ERROR; @@ -898,6 +897,8 @@ { if ((_theXAResource != null) && (_tranID != null)) { + _heuristic = TwoPhaseOutcome.FINISH_OK; + try { _theXAResource.forget(_tranID); @@ -1215,6 +1216,12 @@ _theTransaction = null; _recovered = true; } + + public String toString () + { + return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; + } + /** * For those objects where the original XAResource could not be saved. Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-25 14:54:29 UTC (rev 38451) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-29 09:24:24 UTC (rev 38452) @@ -592,12 +592,10 @@ throw new TRANSACTION_ROLLEDBACK(); case XAException.XA_RETRY: - throw new UNKNOWN(); - case XAException.XAER_INVAL: - case XAException.XAER_RMFAIL: // resource manager - // failed, did it - // rollback? - throw new org.omg.CosTransactions.HeuristicHazard(); + case XAException.XAER_RMFAIL: + _committed = true; // remember for recovery later. + throw new UNKNOWN(); // will cause log to be rewritten. + case XAException.XAER_INVAL: // resource manager failed, did it rollback? default: throw new org.omg.CosTransactions.HeuristicHazard(); } @@ -855,11 +853,11 @@ // presumed abort (or we could be really paranoid and throw a heuristic) throw new TRANSACTION_ROLLEDBACK(); - case XAException.XAER_INVAL: - case XAException.XAER_RMFAIL: // resource manager failed, - // did it rollback? - throw new UNKNOWN(); + case XAException.XAER_INVAL: // resource manager failed, did it rollback? + throw new org.omg.CosTransactions.HeuristicHazard(); + case XAException.XAER_RMFAIL: default: + _committed = true; // will cause log to be rewritten throw new UNKNOWN(); } } @@ -916,6 +914,9 @@ { if ((_theXAResource != null) && (_tranID != null)) { + + _heuristic = TwoPhaseOutcome.FINISH_OK; + try { _theXAResource.forget(_tranID); @@ -1179,6 +1180,11 @@ return _recoveryCoordinator; } + public String toString () + { + return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; + } + protected XAResourceRecord(Uid u) { _theXAResource = null; From jboss-svn-commits at lists.jboss.org Tue Jun 30 06:03:14 2015 From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org) Date: Tue, 30 Jun 2015 06:03:14 -0400 Subject: [jboss-svn-commits] JBL Code SVN: r38453 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692: ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific and 1 other directory. Message-ID: <201506301003.t5UA3Ew2027275@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2015-06-30 06:03:14 -0400 (Tue, 30 Jun 2015) New Revision: 38453 Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java Log: Second attempt backport of JBTM-692 Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2015-06-29 09:24:24 UTC (rev 38452) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2015-06-30 10:03:14 UTC (rev 38453) @@ -621,10 +621,13 @@ return TwoPhaseOutcome.HEURISTIC_HAZARD; // something terminated the transaction! case XAException.XAER_PROTO: case XAException.XA_RETRY: - case XAException.XAER_RMFAIL: // resource manager failed, did it rollback? - _committed = true; + case XAException.XAER_RMFAIL: return TwoPhaseOutcome.FINISH_ERROR; case XAException.XAER_INVAL: + // resource manager + // failed, did it + // rollback? + return TwoPhaseOutcome.HEURISTIC_HAZARD; default: return TwoPhaseOutcome.HEURISTIC_HAZARD; } @@ -842,7 +845,6 @@ return TwoPhaseOutcome.HEURISTIC_HAZARD; // something committed or rolled back without asking us! case XAException.XAER_PROTO: case XAException.XAER_INVAL: - return TwoPhaseOutcome.HEURISTIC_HAZARD; case XAException.XAER_RMFAIL: // resource manager failed, // did it rollback? return TwoPhaseOutcome.FINISH_ERROR; @@ -898,7 +900,7 @@ if ((_theXAResource != null) && (_tranID != null)) { _heuristic = TwoPhaseOutcome.FINISH_OK; - + try { _theXAResource.forget(_tranID); @@ -1216,13 +1218,12 @@ _theTransaction = null; _recovered = true; } - - public String toString () - { - return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; - } - + public String toString () + { + return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; + } + /** * For those objects where the original XAResource could not be saved. */ Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-29 09:24:24 UTC (rev 38452) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-30 10:03:14 UTC (rev 38453) @@ -593,9 +593,9 @@ case XAException.XA_RETRY: case XAException.XAER_RMFAIL: - _committed = true; // remember for recovery later. - throw new UNKNOWN(); // will cause log to be rewritten. - case XAException.XAER_INVAL: // resource manager failed, did it rollback? + throw new UNKNOWN(); + case XAException.XAER_INVAL: + throw new org.omg.CosTransactions.HeuristicHazard(); default: throw new org.omg.CosTransactions.HeuristicHazard(); } @@ -853,11 +853,11 @@ // presumed abort (or we could be really paranoid and throw a heuristic) throw new TRANSACTION_ROLLEDBACK(); - case XAException.XAER_INVAL: // resource manager failed, did it rollback? - throw new org.omg.CosTransactions.HeuristicHazard(); - case XAException.XAER_RMFAIL: + case XAException.XAER_INVAL: + case XAException.XAER_RMFAIL: // resource manager failed, + // did it rollback? + throw new UNKNOWN(); default: - _committed = true; // will cause log to be rewritten throw new UNKNOWN(); } } @@ -914,9 +914,8 @@ { if ((_theXAResource != null) && (_tranID != null)) { - _heuristic = TwoPhaseOutcome.FINISH_OK; - + try { _theXAResource.forget(_tranID); @@ -986,9 +985,7 @@ os.packBoolean(false); } - } - else - { + } else { os.packInt(RecoverableXAConnection.AUTO_RECOVERY); os.packString(_recoveryObject.getClass().getName()); @@ -1180,11 +1177,6 @@ return _recoveryCoordinator; } - public String toString () - { - return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; - } - protected XAResourceRecord(Uid u) { _theXAResource = null; @@ -1203,6 +1195,11 @@ _valid = loadState(); } + public String toString () + { + return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; + } + /** * For those objects where the original XAResource could not be saved. */ From jboss-svn-commits at lists.jboss.org Tue Jun 30 06:51:58 2015 From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org) Date: Tue, 30 Jun 2015 06:51:58 -0400 Subject: [jboss-svn-commits] JBL Code SVN: r38454 - labs/jbosstm/branches. Message-ID: <201506301051.t5UApwsE029723@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2015-06-30 06:51:58 -0400 (Tue, 30 Jun 2015) New Revision: 38454 Removed: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ Log: Failed attempt to backport JBTM-692. Branch deleted. From jboss-svn-commits at lists.jboss.org Tue Jun 30 06:55:04 2015 From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org) Date: Tue, 30 Jun 2015 06:55:04 -0400 Subject: [jboss-svn-commits] JBL Code SVN: r38455 - labs/jbosstm/branches. Message-ID: <201506301055.t5UAt4kj029756@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2015-06-30 06:55:04 -0400 (Tue, 30 Jun 2015) New Revision: 38455 Added: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ Log: 2nd attempt to backport JBTM-692. JBPAPP-11225. From jboss-svn-commits at lists.jboss.org Tue Jun 30 07:20:45 2015 From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org) Date: Tue, 30 Jun 2015 07:20:45 -0400 Subject: [jboss-svn-commits] JBL Code SVN: r38456 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore and 1 other directories. Message-ID: <201506301120.t5UBKjAd004627@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2015-06-30 07:20:44 -0400 (Tue, 30 Jun 2015) New Revision: 38456 Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java Log: JBPAPP-11225. 3rd attempt to backport JBTM-692. Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2015-06-30 10:55:04 UTC (rev 38455) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java 2015-06-30 11:20:44 UTC (rev 38456) @@ -278,6 +278,8 @@ * @message com.arjuna.ats.arjuna.coordinator.BasicAction_71 * [com.arjuna.ats.arjuna.coordinator.BasicAction_71] - Deactivation of * atomic action with id {0} and type {1} unexpectedly failed + * @message com.arjuna.ats.arjuna.coordinator.norecordfound + * [com.arjuna.ats.arjuna.coordinator.norecordfound] - Could not recreate abstract record {0} */ public class BasicAction extends StateManager @@ -1479,10 +1481,11 @@ RecordType.typeToClassName(record_type), record_type, true); - res = (record.restore_state(os, ot) && heuristicList.insert(record)); - try { + + res = (record.restore_state(os, ot) && heuristicList.insert(record)); + record_type = os.unpackInt(); if (tsLogger.arjLoggerI18N.debugAllowed()) @@ -1495,6 +1498,13 @@ { res = false; } + catch (final NullPointerException ex) + { + if (tsLogger.arjLoggerI18N.isWarnEnabled()) + tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.norecordfound", new Object[] { record_type}); + + res = false; + } } } Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2015-06-30 10:55:04 UTC (rev 38455) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/arjunacore/XAResourceRecord.java 2015-06-30 11:20:44 UTC (rev 38456) @@ -621,9 +621,10 @@ return TwoPhaseOutcome.HEURISTIC_HAZARD; // something terminated the transaction! case XAException.XAER_PROTO: case XAException.XA_RETRY: + case XAException.XAER_RMFAIL: return TwoPhaseOutcome.FINISH_ERROR; case XAException.XAER_INVAL: - case XAException.XAER_RMFAIL: // resource manager + // resource manager // failed, did it // rollback? return TwoPhaseOutcome.HEURISTIC_HAZARD; @@ -898,6 +899,8 @@ { if ((_theXAResource != null) && (_tranID != null)) { + _heuristic = TwoPhaseOutcome.FINISH_OK; + try { _theXAResource.forget(_tranID); @@ -1216,6 +1219,11 @@ _recovered = true; } + public String toString () + { + return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; + } + /** * For those objects where the original XAResource could not be saved. */ Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-30 10:55:04 UTC (rev 38455) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-30 11:20:44 UTC (rev 38456) @@ -592,11 +592,9 @@ throw new TRANSACTION_ROLLEDBACK(); case XAException.XA_RETRY: + case XAException.XAER_RMFAIL: throw new UNKNOWN(); case XAException.XAER_INVAL: - case XAException.XAER_RMFAIL: // resource manager - // failed, did it - // rollback? throw new org.omg.CosTransactions.HeuristicHazard(); default: throw new org.omg.CosTransactions.HeuristicHazard(); @@ -916,6 +914,8 @@ { if ((_theXAResource != null) && (_tranID != null)) { + _heuristic = TwoPhaseOutcome.FINISH_OK; + try { _theXAResource.forget(_tranID); @@ -985,9 +985,7 @@ os.packBoolean(false); } - } - else - { + } else { os.packInt(RecoverableXAConnection.AUTO_RECOVERY); os.packString(_recoveryObject.getClass().getName()); @@ -1197,6 +1195,11 @@ _valid = loadState(); } + public String toString () + { + return "XAResourceRecord < resource:"+_theXAResource+", txid:"+_tranID+", heuristic"+TwoPhaseOutcome.stringForm(_heuristic)+" "+super.toString()+" >"; + } + /** * For those objects where the original XAResource could not be saved. */ From jboss-svn-commits at lists.jboss.org Tue Jun 30 09:18:37 2015 From: jboss-svn-commits at lists.jboss.org (jboss-svn-commits at lists.jboss.org) Date: Tue, 30 Jun 2015 09:18:37 -0400 Subject: [jboss-svn-commits] JBL Code SVN: r38457 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific. Message-ID: <201506301318.t5UDIbl2022117@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2015-06-30 09:18:36 -0400 (Tue, 30 Jun 2015) New Revision: 38457 Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java Log: Additional change to back port of JBTM-692 as per mmusgrov review. Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java =================================================================== --- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-30 11:20:44 UTC (rev 38456) +++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP13_JBTM-1481_JBTM-1509_JBTM-692/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2015-06-30 13:18:36 UTC (rev 38457) @@ -593,6 +593,7 @@ case XAException.XA_RETRY: case XAException.XAER_RMFAIL: + _committed = true; throw new UNKNOWN(); case XAException.XAER_INVAL: throw new org.omg.CosTransactions.HeuristicHazard();