[jboss-svn-commits] JBL Code SVN: r26496 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery and 19 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 13 06:13:57 EDT 2009
Author: jhalliday
Date: 2009-05-13 06:13:57 -0400 (Wed, 13 May 2009)
New Revision: 26496
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/sqlserver_driver.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/OracleXARecovery.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/orbix2000/recoverycoordinators/Orbix2kRCServiceInit.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionORBInitializerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
Log:
Use the CLF for printing stack traces rather than calling e.printStackTrace. JBTM-552
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -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.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: PersistenceRecord.java 2342 2006-03-30 13:06:17Z $
*/
@@ -53,12 +53,12 @@
* created/read/modified within the scope of a transaction. It is responsible
* for ensuring that state changes are committed or rolled back on behalf of the
* object depending upon the outcome of the transaction.
- *
+ *
* @author Mark Little (mark at arjuna.com)
* @version $Id: PersistenceRecord.java 2342 2006-03-30 13:06:17Z $
* @since JTS 1.0.
- *
- *
+ *
+ *
* @message com.arjuna.ats.arjuna.PersistenceRecord_1
* [com.arjuna.ats.arjuna.PersistenceRecord_1]
* PersistenceRecord::topLevelCommit() : About to commit state, uid =
@@ -211,12 +211,9 @@
{
if (tsLogger.arjLoggerI18N.isWarnEnabled())
{
- tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_20", new Object[]
- { e });
+ tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.PersistenceRecord_20", new Object[] { e }, e);
}
- e.printStackTrace();
-
return TwoPhaseOutcome.FINISH_ERROR;
}
@@ -626,7 +623,7 @@
protected ObjectStore store;
protected OutputObjectState topLevelState;
protected static boolean classicPrepare = false;
-
+
private static boolean writeOptimisation = false;
static
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/ActionStatusService.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -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.
*/
@@ -52,12 +52,12 @@
/**
* @message com.arjuna.ats.arjuna.recovery.ActionStatusService_1 [com.arjuna.ats.arjuna.recovery.ActionStatusService_1] - transactionType: {0} uid: {1} \n Status is {2}
* @message com.arjuna.ats.arjuna.recovery.ActionStatusService_2 [com.arjuna.ats.arjuna.recovery.ActionStatusService_2] - Other Exception: {0}
- * @message com.arjuna.ats.arjuna.recovery.ActionStatusService_3 [com.arjuna.ats.arjuna.recovery.ActionStatusService_3] - Exception retrieving action status
+ * @message com.arjuna.ats.arjuna.recovery.ActionStatusService_3 [com.arjuna.ats.arjuna.recovery.ActionStatusService_3] - Exception retrieving action status
* @message com.arjuna.ats.arjuna.recovery.ActionStatusService_4 [com.arjuna.ats.arjuna.recovery.ActionStatusService_4] - matching Uid {0} found
* @message com.arjuna.ats.arjuna.recovery.ActionStatucService_5 [com.arjuna.ats.arjuna.recovery.ActionStatusService_5] - ActionStatusService: searching for uid: {0}
* @message com.arjuna.ats.arjuna.recovery.ActionStatusService_6 [com.arjuna.ats.arjuna.recovery.ActionStatusService_6] - Exception when accessing transaction store {0}
* @message com.arjuna.ats.arjuna.recovery.ActionStatusService_7 [com.arjuna.ats.arjuna.recovery.ActionStatusService_7] - Connection Lost to Recovery Manager
-*/
+*/
public class ActionStatusService implements Service
{
@@ -100,7 +100,7 @@
/**
* Does the main work of reading in a uid and transaction type
- * from the recovery manager, retrieving the status of the
+ * from the recovery manager, retrieving the status of the
* transaction and sending it back to the Recovery Manager.
*/
@@ -147,7 +147,7 @@
if ((transactionType == null) && (strUid == null))
return;
-
+
int status = getTransactionStatus( transactionType, strUid );
String strStatus = Integer.toString( status );
@@ -156,7 +156,7 @@
if (tsLogger.arjLoggerI18N.isInfoEnabled())
{
- tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.recovery.ActionStatusService_1",
+ tsLogger.arjLoggerI18N.info("com.arjuna.ats.arjuna.recovery.ActionStatusService_1",
new Object[]{transactionType, strUid, strStatus});
}
}
@@ -169,15 +169,13 @@
}
catch ( Exception ex )
{
- if (tsLogger.arjLoggerI18N.isWarnEnabled()){
- tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_2",
- new Object[]{ex});
- }
-
- ex.printStackTrace();
+ if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_2",
+ new Object[]{ex}, ex);
+ }
}
}
-
+
/**
* Check for transaction status in the local hash table,
* if does not exist, then retrieve the status from the
@@ -186,12 +184,12 @@
private int getActionStatus( Uid tranUid, String transactionType )
{
int action_status = ActionStatus.INVALID;
-
+
try
{
// check in local hash table
BasicAction basic_action = null;
-
+
synchronized ( ActionManager.manager() )
{
basic_action = (BasicAction)ActionManager.manager().get( tranUid );
@@ -214,11 +212,11 @@
{
if (tsLogger.arjLoggerI18N.isWarnEnabled())
{
- tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_3",
+ tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_3",
new Object[]{ex});
}
}
-
+
return action_status;
}
@@ -256,7 +254,7 @@
{
if (tsLogger.arjLoggerI18N.isWarnEnabled())
{
- tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_3",
+ tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.recovery.ActionStatusService_3",
new Object[]{ex});
}
}
@@ -272,10 +270,10 @@
private int getOsStatus( Uid tranUid )
{
int action_status = ActionStatus.INVALID;
-
+
Vector matchingUidVector = new Vector();
Vector matchingUidTypeVector = new Vector();
-
+
try
{
InputObjectState types = new InputObjectState();
@@ -309,7 +307,7 @@
if ( _objectStore.allObjUids( theTypeName, uids ) )
{
Uid theUid = new Uid( Uid.nullUid() );
-
+
while ( !endOfUids )
{
// extract a uid
@@ -378,7 +376,7 @@
{
Uid uid = (Uid)matchingUidVector.get( first_index );
String typeName = (String)matchingUidTypeVector.get( first_index );
-
+
action_status = getObjectStoreStatus( uid, typeName );
}
@@ -397,7 +395,7 @@
rootUid = (Uid)matchingUidVector.get( index );
}
}
-
+
action_status = getObjectStoreStatus( rootUid, rootTypeName );
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/sqlserver_driver.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/sqlserver_driver.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/sqlserver_driver.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -202,7 +202,6 @@
}
catch(Throwable e)
{
-e.printStackTrace();
if(retryConnection(e, pool)) {
return write_state(objUid, tName, state, s, tableName);
} else {
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/JDBCXARecovery.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -109,9 +109,7 @@
{
if (jdbcLogger.loggerI18N.isWarnEnabled())
{
- jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.recovery.xa.initexp", new Object[] { e });
-
- e.printStackTrace();
+ jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.recovery.xa.initexp", new Object[] { e }, e);
}
return false;
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/OracleXARecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/OracleXARecovery.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/recovery/OracleXARecovery.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -106,9 +106,7 @@
{
if (jdbcLogger.loggerI18N.isWarnEnabled())
{
- jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.recovery.oracle.initexp", new Object[] { e });
-
- e.printStackTrace();
+ jdbcLogger.loggerI18N.warn("com.arjuna.ats.internal.jdbc.recovery.oracle.initexp", new Object[] { e }, e);
}
return false;
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1139,10 +1139,8 @@
.warn(
"com.arjuna.ats.internal.jta.recovery.generalrecoveryerror",
new Object[]
- { _logName + ".xaRecovery", e });
+ { _logName + ".xaRecovery", e }, e);
}
-
- e.printStackTrace();
}
try
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/resources/jts/orbspecific/XAResourceRecord.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -606,7 +606,7 @@
catch (Exception e2)
{
_committed = false;
-
+
e2.printStackTrace();
throw new UNKNOWN();
@@ -880,11 +880,9 @@
jtaLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.coperror",
- e2);
+ new Object[] {e2}, e2);
}
- e2.printStackTrace();
-
throw new UNKNOWN();
}
finally
@@ -1148,11 +1146,9 @@
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.restoreerror2",
new Object[]
- { e });
+ { e }, e);
}
- e.printStackTrace();
-
res = false;
}
@@ -1262,8 +1258,6 @@
}
catch (Exception e)
{
- e.printStackTrace();
-
/*
* Unknown error, so better to do nothing at this stage.
*/
@@ -1274,7 +1268,7 @@
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.unexpected",
new Object[]
- { "XAResourceRecord", e });
+ { "XAResourceRecord", e }, e);
}
return XARecoveryResource.FAILED_TO_RECOVER;
@@ -1573,15 +1567,13 @@
}
catch (Exception e2)
{
- e2.printStackTrace();
-
if (jtaLogger.loggerI18N.isWarnEnabled())
{
jtaLogger.loggerI18N
.warn(
"com.arjuna.ats.internal.jta.resources.jts.orbspecific.recfailed",
new Object[]
- { ((commit) ? "commit" : "rollback"), e2 });
+ { ((commit) ? "commit" : "rollback"), e2 }, e2);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1863,12 +1863,10 @@
}
catch (Exception ex)
{
- ex.printStackTrace();
-
if (jtaLogger.loggerI18N.isWarnEnabled())
{
jtaLogger.loggerI18N.warn("com.arjuna.ats.internal.jta.transaction.jts.rollbackerror", new Object[]
- { "TransactionImple.markRollbackOnly -", ex });
+ { "TransactionImple.markRollbackOnly -", ex }, ex);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/context/ContextManager.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -223,11 +223,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.current", ex} );
+ new Object[] { "ContextManager.current", ex}, ex );
}
- ex.printStackTrace();
-
throw new BAD_OPERATION();
}
}
@@ -505,11 +503,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.addActionControlHierarchy", e} );
+ new Object[] { "ContextManager.addActionControlHierarchy", e}, e);
}
- e.printStackTrace();
-
isError = true;
}
@@ -565,11 +561,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.addActionControlImple", e} );
+ new Object[] { "ContextManager.addActionControlImple", e}, e);
}
- e.printStackTrace();
-
isError = true;
}
@@ -756,10 +750,8 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager", stringRef} );
+ new Object[] { "ContextManager", stringRef}, e1 );
}
-
- e1.printStackTrace();
}
catch (Exception e2)
{
@@ -811,11 +803,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.context.genfail",
- new Object[] { "ContextManager.createHierarchy", e} );
+ new Object[] { "ContextManager.createHierarchy", e}, e );
}
- e.printStackTrace();
-
throw new UNKNOWN();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Hewlett Packard Arjuna Labs,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: ServerTopLevelAction.java 2342 2006-03-30 13:06:17Z $
*/
@@ -124,7 +124,7 @@
*
* ATTACH_THREAD_FILTER_(_theResource);
*/
-
+
Coordinator realCoordinator = _theControl.originalCoordinator();
if (!(_valid = registerResource(realCoordinator)))
@@ -134,7 +134,7 @@
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.ipfailed",
new Object[] {"ServerTopLevelAction"});
}
-
+
/*
* Failed to register. Valid is set, and the interposition
* controller will now deal with this.
@@ -146,7 +146,7 @@
else
_valid = false;
}
-
+
public Resource getReference ()
{
if ((_resourceRef == null) && _valid)
@@ -162,10 +162,10 @@
else
_valid = false;
}
-
+
return _resourceRef;
}
-
+
/*
* Will only be called by the remote top-level transaction.
*/
@@ -190,7 +190,7 @@
}
ServerTransaction theTransaction = (ServerTransaction) _theControl.getImplHandle();
-
+
// ThreadActionData.pushAction(theTransaction); // unnecessary if context goes with all calls.
int result = TwoPhaseOutcome.PREPARE_NOTOK;
@@ -220,7 +220,7 @@
break;
}
}
-
+
ThreadActionData.popAction();
if (jtsLogger.logger.isDebugEnabled())
@@ -256,7 +256,7 @@
result = TwoPhaseOutcome.HEURISTIC_HAZARD;
}
}
-
+
switch (result)
{
case TwoPhaseOutcome.INVALID_TRANSACTION:
@@ -269,9 +269,9 @@
return Vote.VoteRollback;
case TwoPhaseOutcome.PREPARE_READONLY:
destroyResource(); // won't necessarily get another invocation!
-
+
// what is we subsequently rollback?
-
+
return Vote.VoteReadOnly;
case TwoPhaseOutcome.HEURISTIC_MIXED:
if (TxControl.getMaintainHeuristics())
@@ -303,13 +303,13 @@
destroyResource();
return;
}
-
+
ServerTransaction theTransaction = (ServerTransaction) _theControl.getImplHandle();
-
+
// ThreadActionData.pushAction(theTransaction);
int actionStatus = theTransaction.status();
-
+
if (actionStatus == ActionStatus.PREPARED)
{
/*
@@ -397,7 +397,7 @@
{
throw new INVALID_TRANSACTION(ExceptionCodes.SERVERAA_NO_CONTROL, CompletionStatus.COMPLETED_NO);
}
-
+
if (_theControl.isWrapper())
{
destroyResource();
@@ -405,9 +405,9 @@
}
ServerTransaction theTransaction = (ServerTransaction) _theControl.getImplHandle();
-
+
// ThreadActionData.pushAction(theTransaction);
-
+
int actionStatus = theTransaction.status();
boolean notPrepared = false;
@@ -417,7 +417,7 @@
* This will also call any after_completions on
* registered synchronizations.
*/
-
+
actionStatus = theTransaction.doPhase2Commit();
}
else
@@ -444,7 +444,7 @@
jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS, "ServerTopLevelAction::commit for "+_theUid+" : "+ActionStatus.stringForm(actionStatus));
}
-
+
switch (actionStatus)
{
case ActionStatus.PREPARED:
@@ -526,7 +526,7 @@
throw new INVALID_TRANSACTION(ExceptionCodes.NO_TRANSACTION, CompletionStatus.COMPLETED_NO);
}
-
+
// ThreadActionData.pushAction(theTransaction);
try
@@ -617,7 +617,7 @@
new Object[] {"ServerTopLevelAction.destroyResource", e});
}
}
-
+
try
{
if (_theResource != null)
@@ -655,7 +655,7 @@
* Register resource and pass RecoveryCoordinator reference
* to the interposed transaction to save and restore.
*/
-
+
RecoveryCoordinator recoveryCoord = theCoordinator.register_resource(_resourceRef);
if (!_theControl.isWrapper())
@@ -711,10 +711,8 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.resources.arjuna.generror",
- new Object[] {"ServerTopLevelAction.registerResource", e});
+ new Object[] {"ServerTopLevelAction.registerResource", e}, e);
}
-
- e.printStackTrace();
}
}
else
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCManager.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -124,7 +124,7 @@
//End for IOR Template
rc = RecoveryCoordinatorHelper.narrow(rcAsObject);
-
+
if (jtsLogger.loggerI18N.isDebugEnabled())
{
jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS,
@@ -149,8 +149,6 @@
catch (Exception ex)
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCManager_2", ex);
-
- ex.printStackTrace();
}
return rc;
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/orbix2000/recoverycoordinators/Orbix2kRCServiceInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/orbix2000/recoverycoordinators/Orbix2kRCServiceInit.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/orbix2000/recoverycoordinators/Orbix2kRCServiceInit.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: Orbix2kRCServiceInit.java 2342 2006-03-30 13:06:17Z $
*
@@ -65,15 +65,15 @@
* All orbs are likely to be the same, constructing a GenericRecoveryCreator,
* but with an orb-specific manager
*
- * @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_1 [com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_1] - Failed to create poa for recoverycoordinators
+ * @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_1 [com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_1] - Failed to create poa for recoverycoordinators
* @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_2 [com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_2] - Orbix2kRCServiceInit - set default servant and activated
- * @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_3 [com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_3] - Orbix2kRCServiceInit - Failed to start RC service
+ * @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_3 [com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_3] - Orbix2kRCServiceInit - Failed to start RC service
* @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_4 [com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_4] - Failed to create default ORB or POA
*/
public class Orbix2kRCServiceInit implements RecoveryServiceInit
{
-
+
public Orbix2kRCServiceInit()
{
}
@@ -84,24 +84,24 @@
* but the policies are usable by the Orbix2kRCManager to create the IOR's in
* TS-using processes.
*/
-
+
static POA getRCPOA (String domainName)
{
String rcServiceName = GenericRecoveryCreator.getRecCoordServiceName();
if (jtsLogger.logger.isDebugEnabled())
{
- jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"Orbix2kRCServiceInit.getRCPOA " + rcServiceName );
}
-
+
if (_poa == null)
{
String poaName = POA_NAME_PREFIX + GenericRecoveryCreator.getRecCoordServiceName();
-
+
_orb = com.arjuna.orbportability.internal.InternalORB.getInstance("RecoveryServer");
-
+
// init it !!
String[] params = new String[2];
params[0] = "-ORBname";
@@ -131,13 +131,13 @@
// specify direct persistence
Any persistenceValue = theORB.create_any();
PersistenceModePolicyValueHelper.insert(persistenceValue, PersistenceModePolicyValue.DIRECT_PERSISTENCE);
-
+
// create direct persistent POA
// make the policy lists, with standard policies
org.omg.CORBA.Policy[] policies = null;
-
+
policies = new Policy []
{
rootPOA.create_lifespan_policy(LifespanPolicyValue.PERSISTENT),
@@ -157,7 +157,7 @@
}
}
- return _poa;
+ return _poa;
}
/**
@@ -176,9 +176,9 @@
com.arjuna.orbportability.ORB mainORB = com.arjuna.orbportability.ORB.getInstance("default");
com.arjuna.orbportability.RootOA mainPOA = com.arjuna.orbportability.OA.getRootOA(mainORB);
-
+
String[] args = null;
-
+
try
{
/*
@@ -190,8 +190,6 @@
}
catch (Exception ex)
{
- ex.printStackTrace();
-
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_4", ex);
return false;
@@ -202,31 +200,31 @@
try {
// get the orb, so we can pass it to the default servant
-
+
// make the default servant
Orbix2kRCDefaultServant theButler = new Orbix2kRCDefaultServant(_orb.orb());
// register it on the POA
ourPOA.set_servant(theButler);
- // activate the poa
+ // activate the poa
ourPOA.the_POAManager().activate();
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_2");
}
-
+
runOaOrbix _runOA = new runOaOrbix();
return true;
} catch (Exception ex) {
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit_3", ex);
return false;
- }
-
+ }
+
}
public static void shutdownRCService ()
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/recovery/RecoveryEnablement.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: RecoveryEnablement.java 2342 2006-03-30 13:06:17Z $
*
@@ -50,7 +50,7 @@
import com.arjuna.ats.arjuna.common.*;
import com.arjuna.orbportability.*;
import com.arjuna.common.util.propertyservice.PropertyManager;
-
+
import com.arjuna.ats.internal.jts.Implementations;
import com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCreator;
@@ -70,7 +70,7 @@
* The class also includes the static startRCservice method (package access),
* used by the RecoveryManager, which is orb-specific
*
- *
+ *
* @author Peter Furniss (peter.furniss at arjuna.com), Mark Little (mark at arjuna.com), Malik Saheb (malik.saheb at arjuna.com)
* @version $Id: RecoveryEnablement.java 2342 2006-03-30 13:06:17Z $
* @since JTS 2.1.
@@ -85,14 +85,14 @@
public class RecoveryEnablement implements RecoveryActivator
{
-
+
private static boolean _isNormalProcess = true;
private static String _RecoveryManagerTag = null;
// no accessible variable for this first property name prefix
private static final String eventHandlerPropertyPrefix = Environment.EVENT_HANDLER;
- /**
+ /**
* Constructor does the work as a result of being registered as an ORBPreInit
* class
*/
@@ -101,30 +101,30 @@
{
Implementations.initialise();
}
-
+
/**
- * This static method is used by the RecoveryManager to suppress
+ * This static method is used by the RecoveryManager to suppress
* aspects of recovery enablement in it's own
* process, without requiring further property manipulations
*/
-
- public static void isNotANormalProcess()
+
+ public static void isNotANormalProcess()
{
_isNormalProcess = false;
}
-
+
public static boolean isNormalProcess ()
{
return _isNormalProcess;
}
-
+
/**
- * Used by the RecoveryManager to start the recoverycoordinator
+ * Used by the RecoveryManager to start the recoverycoordinator
* service, using whatever orb-specific techniques are appropriate.
- * This is placed here because it may need to set post-orbinitialisation
+ * This is placed here because it may need to set post-orbinitialisation
* properties, like the regular enabler.
*/
-
+
public boolean startRCservice()
{
int orbType = ORBInfo.getOrbEnumValue();
@@ -132,9 +132,9 @@
RecoveryServiceInit recoveryService = null;
String theClassName = null;
-
+
// The class that should start the service shall not be called directly. An intermediate class shall be used
- try
+ try
{
switch (orbType)
{
@@ -143,7 +143,7 @@
theClassName = "com.arjuna.ats.internal.jts.orbspecific.orbix2000.recoverycoordinators.Orbix2kRCServiceInit";
recoveryService = (RecoveryServiceInit) Thread.currentThread().getContextClassLoader().loadClass(theClassName).newInstance();
recoveryService.startRCservice();
-
+
result = true;
}
break;
@@ -152,7 +152,7 @@
theClassName = "com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit";
recoveryService = (RecoveryServiceInit) Thread.currentThread().getContextClassLoader().loadClass(theClassName).newInstance();
recoveryService.startRCservice();
-
+
result = true;
}
break;
@@ -168,11 +168,9 @@
}
catch (Exception e)
{
- e.printStackTrace();
-
- jtsLogger.loggerI18N.fatal("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_6", new Object[] {e});
+ jtsLogger.loggerI18N.fatal("com.arjuna.ats.internal.jts.recovery.RecoveryEnablement_6", new Object[] {e}, e);
}
-
+
return result;
}
@@ -187,7 +185,7 @@
return null;
}
}
-
+
static{
// tell the recovery init we aren't a normal TS-user
@@ -196,9 +194,9 @@
// see if there is a property defining the recoverymanager
// servicename
-
+
// _RecoveryManagerTag = System.getProperty(RecoveryEnvironment.RECOVERY_MANAGER_TAG);
-
+
if (_RecoveryManagerTag == null)
{
// if no property, use the hostname/ip address
@@ -213,7 +211,7 @@
{
uhe.printStackTrace();
}
-
+
}
// prune off any spaces
if (_RecoveryManagerTag != null)
@@ -221,6 +219,6 @@
_RecoveryManagerTag =_RecoveryManagerTag.trim();
}
}
-
+
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/transactions/RecoveredTransaction.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -65,15 +65,15 @@
* @version $Id: RecoveredTransaction.java 2342 2006-03-30 13:06:17Z $
*
* @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_1 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_1] - RecoveredTransaction {0} created
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_2 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_2] - RecoveredTransaction activate of {0} failed
+ * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_2 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_2] - RecoveredTransaction activate of {0} failed
* @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_3 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_3] - RecoveredTransaction activate of {0} failed - {1}
* @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5] - RecoveredTransaction.replayPhase2 ({0}) - status = {1}
* @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_6 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_6] - RecoveredTransaction.replayPhase2 for {0} failed
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_7 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_7] - RecoveredTransaction.replayPhase2 ({0}) finished
- * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8] - RecoveredTransaction.removeOldStoreEntry - problem
+ * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_7 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_7] - RecoveredTransaction.replayPhase2 ({0}) finished
+ * @message com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8 [com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8] - RecoveredTransaction.removeOldStoreEntry - problem
*/
-public class RecoveredTransaction extends ArjunaTransactionImple
+public class RecoveredTransaction extends ArjunaTransactionImple
implements RecoveringTransaction
{
public RecoveredTransaction ( Uid actionUid )
@@ -87,25 +87,25 @@
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.loggerI18N.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_1", new Object[]{get_uid()});
}
-
+
// Don't bother trying to activate a transaction that isn't in
// the store. This saves an error message.
_recoveryStatus = RecoveryStatus.ACTIVATE_FAILED;
-
+
String effectiveTypeName = typeName();
-
+
if ( changedTypeName.length() < 1) {
_typeName = null;
} else {
_typeName = changedTypeName;
effectiveTypeName = changedTypeName;
}
-
+
_originalProcessUid = new Uid(Uid.nullUid());
try
@@ -122,9 +122,7 @@
}
catch (Exception e)
{
- jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_3", new Object[]{actionUid, e});
-
- e.printStackTrace();
+ jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_3", new Object[]{actionUid, e}, e);
}
_txStatus = Status.StatusUnknown;
@@ -139,19 +137,19 @@
{
if (_txStatus != Status.StatusUnknown)
return _txStatus;
-
+
Status theStatus = Status.StatusUnknown;
if (_recoveryStatus == RecoveryStatus.ACTIVATE_FAILED)
theStatus = Status.StatusRolledBack;
else
theStatus = super.get_status();
-
+
return theStatus;
}
/**
- *
+ *
*/
public Status getOriginalStatus()
{
@@ -202,8 +200,8 @@
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5", new Object[]{get_uid(), Utility.stringStatus(theStatus)});
}
@@ -235,8 +233,8 @@
if (jtsLogger.loggerI18N.isDebugEnabled())
{
- jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_CRASH_RECOVERY,
+ jtsLogger.loggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_CRASH_RECOVERY,
"com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_5", new Object[]{get_uid()});
}
}
@@ -267,7 +265,7 @@
if ((super.failedList != null) && (super.failedList.size() > 0))
return false;
-
+
if ((super.pendingList != null) && (super.pendingList.size() > 0))
return false;
@@ -277,7 +275,7 @@
return true;
}
}
-
+
public String type()
{
if (_typeName == null) {
@@ -295,7 +293,7 @@
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransaction_8", ex);
}
}
-
+
public boolean assumeComplete()
{
_typeName = AssumedCompleteTransaction.typeName();
@@ -317,7 +315,7 @@
* If there is a transaction present than pack the process Uid of
* this JVM and the tx id. Otherwise pack a null Uid.
*/
-
+
super.packHeader(os, txId, _originalProcessUid);
}
@@ -339,7 +337,7 @@
{
// do the other stuff
boolean result = super.save_state(objectState,ot);
-
+
// iff assumed complete, include the time (this should happen only once)
if (_typeName != null && result) {
Date lastActiveTime = new Date();
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: ContextClientRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -56,7 +56,7 @@
import org.omg.PortableInterceptor.ClientRequestInterceptor;
/**
- * PortableInterceptor::ClientRequestInterceptor implementation which adds a
+ * PortableInterceptor::ClientRequestInterceptor implementation which adds a
* service context carrying the transaction context.
*/
@@ -117,7 +117,7 @@
public void destroy ()
{
}
-
+
/**
* @message com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.error Context interceptor caught an unexpected exception:
* @message com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.invalidparam Invalid portable interceptor transaction parameter!
@@ -133,14 +133,14 @@
if (systemCall(request_info))
return;
-
+
final boolean otsAlwaysPropagate = InterceptorInfo.getAlwaysPropagate() ;
try
{
if (!otsAlwaysPropagate)
{
TransactionalObject ptr = org.omg.CosTransactions.TransactionalObjectHelper.narrow(request_info.target());
-
+
if (ptr == null)
throw new BAD_PARAM();
}
@@ -212,7 +212,7 @@
{
problem = true;
}
-
+
theControl = null;
}
else
@@ -227,7 +227,7 @@
* Only throw an exception if we have no
* transaction context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
else
@@ -239,7 +239,7 @@
org.omg.CORBA.Any data = ORBManager.getORB().orb().create_any();
data.insert_string(stringRef);
-
+
byte[] octets = _codec.encode_value(data);
ServiceContext service_context = new ServiceContext(OTSManager.serviceId, octets);
@@ -256,8 +256,6 @@
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.error", ex);
}
-
- ex.printStackTrace();
throw new UNKNOWN(ex.toString());
}
@@ -321,7 +319,7 @@
else
return false;
}
-
+
private int _localSlot;
private Codec _codec;
private ThreadLocal _inUse = new ThreadLocal();
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -135,11 +135,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.codecerror",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.codeccreate"), ex);
}
@@ -164,11 +162,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.cie"), ex);
}
@@ -193,11 +189,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.context.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -135,11 +135,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.codecerror",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.codeccreate"), ex);
}
@@ -164,11 +162,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.cie"), ex);
}
@@ -193,11 +189,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/hporb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: InterpositionServerRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -52,7 +52,7 @@
import org.omg.PortableInterceptor.ServerRequestInterceptor;
/**
- * PortableInterceptor::ServerRequestInterceptor implementation which checks
+ * PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
*
* @message com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.srie {0} caught an unexpected exception: {1}
@@ -122,7 +122,7 @@
jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
(com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS | com.arjuna.ats.jts.logging.FacilityCode.FAC_INTERCEPTOR), "InterpositionServerRequestInterceptorImpl::receive_request_service_contexts ( "+request_info.operation()+" )");
}
-
+
try
{
try
@@ -137,7 +137,7 @@
{
// just in case the object isn't in the IR.
}
-
+
/*
* OK, we may be transactional and expect some context information,
* even if it zero.
@@ -146,7 +146,7 @@
try
{
ServiceContext serviceContext = null;
-
+
try
{
serviceContext = request_info.get_request_service_context(OTSManager.serviceId);
@@ -178,7 +178,7 @@
* Only throw an exception if we have no transaction
* context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
}
@@ -230,11 +230,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex} );
+ new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex}, ex);
}
- ex.printStackTrace();
-
throw ex;
}
catch (Exception e)
@@ -242,7 +240,7 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.hporb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", e} );
+ new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", e}, e);
}
throw new BAD_OPERATION();
@@ -345,7 +343,7 @@
if ((threadId = data.extract_string()) != null)
{
ControlWrapper ctx = OTSImpleManager.current().contextManager().popAction(threadId);
-
+
OTSImpleManager.current().contextManager().purgeActions(threadId);
}
}
@@ -353,7 +351,7 @@
{
// not a string, so still a pgcts
}
-
+
request_info.set_slot(_dataSlot, null);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Technologies Ltd.,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: ContextClientRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -60,7 +60,7 @@
import org.omg.PortableInterceptor.ClientRequestInterceptor;
/**
- * PortableInterceptor::ClientRequestInterceptor implementation which adds a
+ * PortableInterceptor::ClientRequestInterceptor implementation which adds a
* service context carrying the transaction context.
*/
@@ -122,7 +122,7 @@
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.error Context interceptor caught an unexpected exception:
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.invalidparam Invalid portable interceptor transaction parameter!
*/
-
+
public void send_request (ClientRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -133,14 +133,14 @@
if (systemCall(request_info))
return;
-
+
final boolean otsAlwaysPropagate = InterceptorInfo.getAlwaysPropagate() ;
try
{
if (!otsAlwaysPropagate)
{
TransactionalObject ptr = TransactionalObjectHelper.narrow(request_info.target());
-
+
if (ptr == null)
throw new BAD_PARAM();
}
@@ -212,7 +212,7 @@
{
problem = true;
}
-
+
theControl = null;
}
else
@@ -227,7 +227,7 @@
* Only throw an exception if we have no
* transaction context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
else
@@ -239,7 +239,7 @@
Any data = ORBManager.getORB().orb().create_any();
data.insert_string(stringRef);
-
+
byte[] octets = _codec.encode_value(data);
ServiceContext service_context = new ServiceContext(OTSManager.serviceId, octets);
@@ -256,8 +256,6 @@
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.error", ex);
}
-
- ex.printStackTrace();
throw new UNKNOWN(ex.toString());
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -113,11 +113,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codecerror",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.codeccreate"), ex);
}
@@ -142,11 +140,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.cie"), ex);
}
@@ -171,11 +167,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.context.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -117,11 +117,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codecerror",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.codeccreate"), ex);
}
@@ -146,11 +144,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.cie"), ex);
}
@@ -175,11 +171,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/jacorb/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Technologies Ltd.,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: InterpositionServerRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -55,7 +55,7 @@
import org.omg.PortableInterceptor.ServerRequestInterceptor;
/**
- * PortableInterceptor::ServerRequestInterceptor implementation which checks
+ * PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
*
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie {0} caught an unexpected exception: {1}
@@ -121,7 +121,7 @@
jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
(com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS | com.arjuna.ats.jts.logging.FacilityCode.FAC_INTERCEPTOR), "InterpositionServerRequestInterceptorImpl::receive_request_service_contexts ( "+request_info.operation()+" )");
}
-
+
try
{
try
@@ -136,7 +136,7 @@
{
// just in case the object isn't in the IR.
}
-
+
/*
* OK, we may be transactional and expect some context information,
* even if it zero.
@@ -145,7 +145,7 @@
try
{
ServiceContext serviceContext = null;
-
+
try
{
serviceContext = request_info.get_request_service_context(OTSManager.serviceId);
@@ -177,7 +177,7 @@
* Only throw an exception if we have no transaction
* context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
}
@@ -229,10 +229,8 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex} );
+ new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex}, ex);
}
-
- ex.printStackTrace();
throw ex;
}
@@ -345,7 +343,7 @@
{
// ControlWrapper ctx = OTSImpleManager.systemCurrent().contextManager().popAction(threadId);
ControlWrapper ctx = OTSImpleManager.current().contextManager().popAction(threadId);
-
+
// OTSImpleManager.systemCurrent().contextManager().purgeActions(threadId);
OTSImpleManager.current().contextManager().purgeActions(threadId);
@@ -355,7 +353,7 @@
{
// not a string, so still a pgcts
}
-
+
request_info.set_slot(_dataSlot, null);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: ContextClientRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -59,7 +59,7 @@
import org.omg.PortableInterceptor.ClientRequestInterceptor;
/**
- * PortableInterceptor::ClientRequestInterceptor implementation which adds a
+ * PortableInterceptor::ClientRequestInterceptor implementation which adds a
* service context carrying the transaction context.
*/
@@ -141,7 +141,7 @@
* @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.error Context interceptor caught an unexpected exception:
* @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.invalidparam Invalid portable interceptor transaction parameter!
*/
-
+
public void send_request (ClientRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -152,14 +152,14 @@
if (systemCall(request_info))
return;
-
+
final boolean otsAlwaysPropagate = InterceptorInfo.getAlwaysPropagate() ;
try
{
if (!otsAlwaysPropagate)
{
TransactionalObject ptr = TransactionalObjectHelper.narrow(request_info.target());
-
+
if (ptr == null)
throw new BAD_PARAM();
}
@@ -231,7 +231,7 @@
{
problem = true;
}
-
+
theControl = null;
}
else
@@ -246,7 +246,7 @@
* Only throw an exception if we have no
* transaction context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
else
@@ -258,7 +258,7 @@
Any data = ORBManager.getORB().orb().create_any();
data.insert_string(stringRef);
-
+
byte[] octets = _codec.encode_value(data);
ServiceContext service_context = new ServiceContext(OTSManager.serviceId, octets);
@@ -275,8 +275,6 @@
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.error", ex);
}
-
- ex.printStackTrace();
throw new UNKNOWN(ex.toString());
}
@@ -340,7 +338,7 @@
else
return false;
}
-
+
private int _localSlot;
private Codec _codec;
private ThreadLocal _inUse = new ThreadLocal();
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -127,11 +127,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codecerror",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.codeccreate"), ex);
}
@@ -156,11 +154,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.cie"), ex);
}
@@ -185,11 +181,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.context.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -127,11 +127,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codecerror",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.codeccreate"), ex);
}
@@ -156,11 +154,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.cie"), ex);
}
@@ -185,11 +181,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/javaidl/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: InterpositionServerRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -55,7 +55,7 @@
import org.omg.PortableInterceptor.ServerRequestInterceptor;
/**
- * PortableInterceptor::ServerRequestInterceptor implementation which checks
+ * PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
*
* @message com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie {0} caught an unexpected exception: {1}
@@ -141,7 +141,7 @@
jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
(com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS | com.arjuna.ats.jts.logging.FacilityCode.FAC_INTERCEPTOR), "InterpositionServerRequestInterceptorImpl::receive_request_service_contexts ( "+request_info.operation()+" )");
}
-
+
try
{
try
@@ -156,7 +156,7 @@
{
// just in case the object isn't in the IR.
}
-
+
/*
* OK, we may be transactional and expect some context information,
* even if it zero.
@@ -165,7 +165,7 @@
try
{
ServiceContext serviceContext = null;
-
+
try
{
serviceContext = request_info.get_request_service_context(OTSManager.serviceId);
@@ -197,7 +197,7 @@
* Only throw an exception if we have no transaction
* context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
}
@@ -249,10 +249,8 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.javaidl.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex} );
+ new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex}, ex);
}
-
- ex.printStackTrace();
throw ex;
}
@@ -364,7 +362,7 @@
if ((threadId = data.extract_string()) != null)
{
ControlWrapper ctx = OTSImpleManager.current().contextManager().popAction(threadId);
-
+
OTSImpleManager.current().contextManager().purgeActions(threadId);
}
}
@@ -372,7 +370,7 @@
{
// not a string, so still a pgcts
}
-
+
request_info.set_slot(_dataSlot, null);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextClientRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: ContextClientRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -53,8 +53,8 @@
import org.omg.CosTransactions.*;
import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
import org.omg.IOP.*;
import org.omg.IOP.CodecFactoryPackage.*;
@@ -67,7 +67,7 @@
import org.omg.CosTransactions.Unavailable;
/**
- * PortableInterceptor::ClientRequestInterceptor implementation which adds a
+ * PortableInterceptor::ClientRequestInterceptor implementation which adds a
* service context carrying the transaction context.
*/
@@ -129,7 +129,7 @@
* @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.error Context interceptor caught an unexpected exception:
* @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.invalidparam Invalid portable interceptor transaction parameter!
*/
-
+
public void send_request (ClientRequestInfo request_info) throws SystemException
{
if (jtsLogger.logger.isDebugEnabled())
@@ -140,14 +140,14 @@
if (systemCall(request_info))
return;
-
+
final boolean otsAlwaysPropagate = InterceptorInfo.getAlwaysPropagate() ;
try
{
if (!otsAlwaysPropagate)
{
TransactionalObject ptr = org.omg.CosTransactions.TransactionalObjectHelper.narrow(request_info.target());
-
+
if (ptr == null)
throw new BAD_PARAM();
}
@@ -219,7 +219,7 @@
{
problem = true;
}
-
+
theControl = null;
}
else
@@ -234,7 +234,7 @@
* Only throw an exception if we have no
* transaction context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
else
@@ -246,7 +246,7 @@
org.omg.CORBA.Any data = ORBManager.getORB().orb().create_any();
data.insert_string(stringRef);
-
+
byte[] octets = _codec.encode_value(data);
ServiceContext service_context = new ServiceContext(OTSManager.serviceId, octets);
@@ -263,8 +263,6 @@
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.error", ex);
}
-
- ex.printStackTrace();
throw new UNKNOWN(ex.toString());
}
@@ -328,7 +326,7 @@
else
return false;
}
-
+
private int _localSlot;
private Codec _codec;
private ThreadLocal _inUse = new ThreadLocal();
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/context/ContextORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -124,11 +124,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.codecerror",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.codeccreate"), ex);
}
@@ -153,11 +151,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.cie"), ex);
}
@@ -182,11 +178,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.duplicatename",
- new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "ContextORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.context.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionORBInitializerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionORBInitializerImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -124,11 +124,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.codecerror",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ENCODING_CDR_ENCAPS" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.codeccreate"), ex);
}
@@ -153,11 +151,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ClientRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.cie"), ex);
}
@@ -182,11 +178,9 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.duplicatename",
- new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" });
+ new java.lang.Object[] { "InterpositionORBInitializerImpl", "ServerRequestInterceptor" }, ex);
}
- ex.printStackTrace();
-
throw new FatalError(jtsLogger.logMesg.getString("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.sie"), ex);
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 09:40:32 UTC (rev 26495)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/orbspecific/orbix2000/interceptors/interposition/InterpositionServerRequestInterceptorImpl.java 2009-05-13 10:13:57 UTC (rev 26496)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* 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
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a 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
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -24,7 +24,7 @@
* Arjuna Solutions Limited,
* Newcastle upon Tyne,
* Tyne and Wear,
- * UK.
+ * UK.
*
* $Id: InterpositionServerRequestInterceptorImpl.java 2342 2006-03-30 13:06:17Z $
*/
@@ -52,8 +52,8 @@
import org.omg.CosTransactions.*;
import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
import org.omg.IOP.*;
import org.omg.IOP.CodecFactoryPackage.*;
@@ -66,7 +66,7 @@
import org.omg.CosTransactions.Unavailable;
/**
- * PortableInterceptor::ServerRequestInterceptor implementation which checks
+ * PortableInterceptor::ServerRequestInterceptor implementation which checks
* that a transaction context was received.
*
* @message com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.srie {0} caught an unexpected exception: {1}
@@ -132,7 +132,7 @@
jtsLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
(com.arjuna.ats.jts.logging.FacilityCode.FAC_OTS | com.arjuna.ats.jts.logging.FacilityCode.FAC_INTERCEPTOR), "InterpositionServerRequestInterceptorImpl::receive_request_service_contexts ( "+request_info.operation()+" )");
}
-
+
try
{
try
@@ -147,7 +147,7 @@
{
// just in case the object isn't in the IR.
}
-
+
/*
* OK, we may be transactional and expect some context information,
* even if it zero.
@@ -156,7 +156,7 @@
try
{
ServiceContext serviceContext = null;
-
+
try
{
serviceContext = request_info.get_request_service_context(OTSManager.serviceId);
@@ -188,7 +188,7 @@
* Only throw an exception if we have no transaction
* context and we require one.
*/
-
+
if (InterceptorInfo.getNeedTranContext())
throw new TRANSACTION_REQUIRED();
}
@@ -240,10 +240,8 @@
if (jtsLogger.loggerI18N.isWarnEnabled())
{
jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.orbix2000.interceptors.interposition.srie",
- new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex} );
+ new java.lang.Object[] {"InterpositionServerRequestInterceptorImpl::send_reply", ex}, ex);
}
-
- ex.printStackTrace();
throw ex;
}
@@ -355,7 +353,7 @@
if ((threadId = data.extract_string()) != null)
{
ControlWrapper ctx = OTSImpleManager.current().contextManager().popAction(threadId);
-
+
OTSImpleManager.current().contextManager().purgeActions(threadId);
}
}
@@ -363,7 +361,7 @@
{
// not a string, so still a pgcts
}
-
+
request_info.set_slot(_dataSlot, null);
}
}
More information about the jboss-svn-commits
mailing list