[jboss-cvs] JBossAS SVN: r111521 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core: connectionmanager and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jun 4 21:12:52 EDT 2011
Author: jeff.zhang
Date: 2011-06-04 21:12:52 -0400 (Sat, 04 Jun 2011)
New Revision: 111521
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java
Log:
[JBJCA-592] use Object as parameter instead of toString
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-03 20:28:02 UTC (rev 111520)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-05 01:12:52 UTC (rev 111521)
@@ -81,11 +81,12 @@
/**
* SecurityContext setup failed
+ * @param description throwable description
* @param t The exception
*/
@LogMessage(level = ERROR)
@Message(id = 201, value = "SecurityContext setup failed: %s")
- public void securityContextSetupFailed(@Cause Throwable t);
+ public void securityContextSetupFailed(String description, @Cause Throwable t);
/**
* SecurityContext setup failed since CallbackSecurity was null
@@ -102,8 +103,8 @@
* @param managedConnection The managedConnection instance
*/
@LogMessage(level = INFO)
- @Message(id = 301, value = "Registered a null handle for managedConnection: %s")
- public void registeredNullHandleManagedConnection(String managedConnection);
+ @Message(id = 301, value = "Registered a null handle for managed connection: %s")
+ public void registeredNullHandleManagedConnection(Object managedConnection);
/**
* Unregistered handle that was not registered
@@ -113,31 +114,33 @@
@LogMessage(level = INFO)
@Message(id = 302, value = "Unregistered handle that was not registered! %s" +
" for managedConnection: %s")
- public void unregisteredHandleNotRegistered(Object handle, String managedConnection);
+ public void unregisteredHandleNotRegistered(Object handle, Object managedConnection);
/**
* Unregistered a null handle for managedConnection
* @param managedConnection The managedConnection instance
*/
@LogMessage(level = INFO)
- @Message(id = 303, value = "Registered a null handle for managedConnection: %s")
- public void unregisteredNullHandleManagedConnection(String managedConnection);
+ @Message(id = 303, value = "Registered a null handle for managed connection: %s")
+ public void unregisteredNullHandleManagedConnection(Object managedConnection);
/**
* Connection error occured
+ * @param description throwable description
* @param t The exception
*/
@LogMessage(level = WARN)
- @Message(id = 305, value = "Connection error occured: %s")
- public void connectionErrorOccured(@Cause Throwable t);
+ @Message(id = 305, value = "Connection error occured %s")
+ public void connectionErrorOccured(String description, @Cause Throwable t);
/**
* Unknown Connection error occured
+ * @param description throwable description
* @param t The exception
*/
@LogMessage(level = WARN)
- @Message(id = 306, value = "Unknown Connection error occured: %s")
- public void unknownConnectionErrorOccured(@Cause Throwable t);
+ @Message(id = 306, value = "Unknown connection error occured %s")
+ public void unknownConnectionErrorOccured(String description, @Cause Throwable t);
/**
@@ -152,7 +155,7 @@
* @param t The exception
*/
@LogMessage(level = INFO)
- @Message(id = 311, value = "throwable from unregister connection")
+ @Message(id = 311, value = "Throwable from unregister connection")
public void throwableFromUnregisterConnection(@Cause Throwable t);
/**
@@ -181,7 +184,7 @@
*/
@LogMessage(level = WARN)
@Message(id = 401, value = "Error during tidy up connection: %s")
- public void errorDuringTidyUpConnection(String cl, @Cause Throwable t);
+ public void errorDuringTidyUpConnection(Object cl, @Cause Throwable t);
/**
* resourceException in returning connection
@@ -189,8 +192,8 @@
* @param t The exception
*/
@LogMessage(level = WARN)
- @Message(id = 402, value = "resourceException in returning connection: %s")
- public void resourceExceptionReturningConnection(String mc, @Cause Throwable t);
+ @Message(id = 402, value = "ResourceException in returning connection: %s")
+ public void resourceExceptionReturningConnection(Object mc, @Cause Throwable t);
/**
* reconnecting a connection handle that still has a managedConnection
@@ -198,8 +201,8 @@
* @param connection connection object
*/
@LogMessage(level = WARN)
- @Message(id = 403, value = "reconnecting a connection handle that still has a managedConnection! %s %s")
- public void reconnectingConnectionHandleHasManagedConnection(String mc, Object connection);
+ @Message(id = 403, value = "Reconnecting a connection handle that still has a managedConnection! %s %s")
+ public void reconnectingConnectionHandleHasManagedConnection(Object mc, Object connection);
/**
* Unchecked throwable in managedConnectionDisconnected()
@@ -208,7 +211,7 @@
*/
@LogMessage(level = WARN)
@Message(id = 404, value = "Unchecked throwable in managedConnectionDisconnected() cl= %s")
- public void uncheckedThrowableInManagedConnectionDisconnected(String cl, @Cause Throwable t);
+ public void uncheckedThrowableInManagedConnectionDisconnected(Object cl, @Cause Throwable t);
// TRANSACTION SYNCHRONIZER (500)
@@ -220,8 +223,8 @@
* @param t The exception
*/
@LogMessage(level = WARN)
- @Message(id = 501, value = "thread %s is not the enlisting thread %s")
- public void threadIsnotEnlistingThread(String currentThread, String enlistingThread, @Cause Throwable t);
+ @Message(id = 501, value = "Thread %s is not the enlisting thread %s")
+ public void threadIsnotEnlistingThread(Object currentThread, Object enlistingThread, @Cause Throwable t);
/**
* Transaction error in before completion
@@ -231,7 +234,7 @@
*/
@LogMessage(level = WARN)
@Message(id = 502, value = "Transaction %s error in before completion %s")
- public void transactionErrorInBeforeCompletion(String transaction, String synch, @Cause Throwable t);
+ public void transactionErrorInBeforeCompletion(Object transaction, Object synch, @Cause Throwable t);
/**
* Transaction error in after completion
@@ -241,5 +244,5 @@
*/
@LogMessage(level = WARN)
@Message(id = 503, value = "Transaction %s error in after completion %s")
- public void transactionErrorInAfterCompletion(String transaction, String synch, @Cause Throwable t);
+ public void transactionErrorInAfterCompletion(Object transaction, Object synch, @Cause Throwable t);
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2011-06-03 20:28:02 UTC (rev 111520)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2011-06-05 01:12:52 UTC (rev 111521)
@@ -416,7 +416,7 @@
}
catch (Throwable t)
{
- log.errorDuringTidyUpConnection(cl.toString(), t);
+ log.errorDuringTidyUpConnection(cl, t);
kill = true;
}
@@ -435,7 +435,7 @@
}
else
{
- log.resourceExceptionReturningConnection(cl.getManagedConnection().toString(), re);
+ log.resourceExceptionReturningConnection(cl.getManagedConnection(), re);
}
}
}
@@ -556,7 +556,7 @@
{
//This might well be an error.
log.reconnectingConnectionHandleHasManagedConnection(
- cr.getConnectionListener().getManagedConnection().toString(),
+ cr.getConnectionListener().getManagedConnection(),
cr.getConnection());
}
ConnectionListener cl = criToCLMap.get(cr.getCri());
@@ -620,7 +620,7 @@
}
catch (Throwable t)
{
- log.uncheckedThrowableInManagedConnectionDisconnected(cl.toString(), t);
+ log.uncheckedThrowableInManagedConnectionDisconnected(cl, t);
}
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2011-06-03 20:28:02 UTC (rev 111520)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2011-06-05 01:12:52 UTC (rev 111521)
@@ -216,7 +216,7 @@
}
else
{
- log.registeredNullHandleManagedConnection(managedConnection.toString());
+ log.registeredNullHandleManagedConnection(managedConnection);
}
}
@@ -260,12 +260,12 @@
{
if (!connectionHandles.remove(handle))
{
- log.unregisteredHandleNotRegistered(handle, managedConnection.toString());
+ log.unregisteredHandleNotRegistered(handle, managedConnection);
}
}
else
{
- log.unregisteredNullHandleManagedConnection(managedConnection.toString());
+ log.unregisteredNullHandleManagedConnection(managedConnection);
}
if (trace)
@@ -327,12 +327,12 @@
cause = new Exception("No exception was reported");
}
- log.connectionErrorOccured(cause);
+ log.connectionErrorOccured(cause.getMessage(), cause);
}
else
{
Throwable cause = new Exception("No exception was reported");
- log.unknownConnectionErrorOccured(cause);
+ log.unknownConnectionErrorOccured(cause.getMessage(), cause);
}
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java 2011-06-03 20:28:02 UTC (rev 111520)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java 2011-06-05 01:12:52 UTC (rev 111521)
@@ -169,7 +169,7 @@
if (enlistingThread == null || enlistingThread != currentThread)
{
- log.threadIsnotEnlistingThread(currentThread.toString(), enlistingThread.toString(),
+ log.threadIsnotEnlistingThread(currentThread, enlistingThread,
new Exception("STACKTRACE"));
return;
}
@@ -328,7 +328,7 @@
}
catch (Throwable t)
{
- log.transactionErrorInBeforeCompletion(tx.toString(), synch.toString(), t);
+ log.transactionErrorInBeforeCompletion(tx, synch, t);
}
}
@@ -346,7 +346,7 @@
}
catch (Throwable t)
{
- log.transactionErrorInAfterCompletion(tx.toString(), synch.toString(), t);
+ log.transactionErrorInAfterCompletion(tx, synch, t);
}
}
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java 2011-06-03 20:28:02 UTC (rev 111520)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/workmanager/WorkWrapper.java 2011-06-05 01:12:52 UTC (rev 111521)
@@ -320,7 +320,7 @@
}
catch (Throwable t)
{
- log.securityContextSetupFailed(t);
+ log.securityContextSetupFailed(t.getMessage(), t);
fireWorkContextSetupFailed(ctx);
throw new WorkException("SecurityContext setup failed: " + t.getMessage(), t);
}
More information about the jboss-cvs-commits
mailing list