Index: transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java =================================================================== --- transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java (revision 32113) +++ transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java (working copy) @@ -895,7 +895,8 @@ break; } } catch (XAException e) { - _logger.log(Level.WARNING,"jts.xaexception_in_recovery",e); + _logger.log(Level.WARNING,"jts.xaexception_in_recovery", e.errorCode); + _logger.log(Level.WARNING,"",e); break; } Index: transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/OracleXAResource.java =================================================================== --- transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/OracleXAResource.java (revision 32113) +++ transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/OracleXAResource.java (working copy) @@ -115,6 +115,9 @@ // throw new XAException("oracle XA Resource wrapper : "+sqlexception); throw new XAException(sm.getString("transaction.oracle_sqlexception_occurred",sqlexception)); } + catch(XAException e){ + throw e; + } catch(Exception e){ throw new XAException(sm.getString("transaction.oracle_unknownexception_occurred",e)); // throw new XAException("oracle XA Resource wrapper : "+e); Index: transaction/jts/src/main/resources/com/sun/jts/LogStrings.properties =================================================================== --- transaction/jts/src/main/resources/com/sun/jts/LogStrings.properties (revision 32113) +++ transaction/jts/src/main/resources/com/sun/jts/LogStrings.properties (working copy) @@ -59,14 +59,14 @@ jts.log_error = JTS5022: Unexpected exception [{0}] from log. JTS5022.diag.check.1=This is an Unexpected Internal Error. Please contact Sun with the complete error log message. jts.heuristic_exception = JTS5023: Heuristic exception [{0}] cannot be reported to superior in resync. -jts.create_recoverycoordinator_error = JTS5024::Cannot create RecoveryCoordinator object reference. +jts.create_recoverycoordinator_error = JTS5024: Cannot create RecoveryCoordinator object reference. JTS5024.diag.check.1=This is an Unexpected Internal Error. Please contact Sun with the complete error log message. jts.log_file_transient_server = JTS5025: Log file exists for transient server [{0}]. jts.recovery_in_doubt = JTS5026: Exception [{0}] recovering an in-doubt Coordinator. JTS5026.diag.check.1=This is an Unexpected Internal Error. Please contact Sun with the complete error log message. jts.resync_failed = JTS5027: Exception [{0}] on [{1}] operation during resync. JTS5027.diag1.check.1=See the server log for more details. -jts.xaexception_in_recovery = JTS5028: XAException occured during recovery of XAResource objects. +jts.xaexception_in_recovery = JTS5028: XAException occurred during recovery of XAResource objects; XA Error Code : [{0}] JTS5028.diag.cause.1=XAResource.recover has thrown an exception during recovery. JTS5028.diag.check.1=See the exception Stack trace for more details. jts.exception_during_resync = JTS5029: Exception [{0}] on [{1}] operation during resync. @@ -138,7 +138,7 @@ jts.error_while_enabling_monitoring = JTS5061: Exception occurred while enabling transaction monitoring jts.error_while_setting_xares_txn_timeout = JTS5062: Exception occurred while setting XAResource timeout JTS5062.diag.check.1=See the server log for more details. XAResource.setTransactionTimeout() might not be supported for this XAResource. -jts.unexpected_xa_error_in_beforecompletion = JTS5063: Unexpected error occurred in beforeCompletion, XA Error Code : [{0}], Error MEssage : [{1}] +jts.unexpected_xa_error_in_beforecompletion = JTS5063: Unexpected error occurred in beforeCompletion, XA Error Code : [{0}], Error Message : [{1}] jts.delist_exception = JTS5064: Unexpected exception occurred while delisting the resource JTS5064.diag.cause.1=Unexpected exception thrown from XAResource.end. JTS5064.diag.check.1=See the server log for more details. Index: transaction/internal-api/src/main/resources/com/sun/enterprise/transaction/api/LocalStrings.properties =================================================================== --- transaction/internal-api/src/main/resources/com/sun/enterprise/transaction/api/LocalStrings.properties (revision 32113) +++ transaction/internal-api/src/main/resources/com/sun/enterprise/transaction/api/LocalStrings.properties (working copy) @@ -1,6 +1,6 @@ transaction.enabling_monitoring_failed=Could not enable the transaction monitoring transaction.oracle_xa_wrapper_connection_failed= failed to get a connection from the wrapper -transaction.oracle_unknownexception_occurred=unknown exception thrwon from oracle driver: {0} +transaction.oracle_unknownexception_occurred=unknown exception thrown from oracle driver: {0} transaction.oracle_sqlexception_occurred=SQL Exception thrown from oracle driver: {0} transaction.sybase_xa_wrapper_connection_failed=failed to get a connection from the wrapper: {0} transaction.for_recovery_only=This method can be used only for recovery