You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/03/03 19:35:39 UTC
svn commit: r749682 -
/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
Author: gawor
Date: Tue Mar 3 18:35:38 2009
New Revision: 749682
URL: http://svn.apache.org/viewvc?rev=749682&view=rev
Log:
Do rollback in case of an exception. Based on patch from Ivan (GERONIMO-4544)
Modified:
geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java?rev=749682&r1=749681&r2=749682&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java Tue Mar 3 18:35:38 2009
@@ -161,12 +161,14 @@
}
}
conn.commit();
- } catch (Throwable e) {
- if (e instanceof SQLException) {
- result = getSQLError((SQLException) e);
- } else {
- result = e.getMessage();
+ } catch (SQLException e) {
+ try {
+ conn.rollback();
+ } catch (Exception unHandledException) {
}
+ result = getSQLError(e);
+ } catch (Throwable e) {
+ result = e.getMessage();
} finally {
// close DB connection
try {