You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/07/09 22:29:07 UTC
svn commit: r1359379 - in
/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc:
Messages.properties RMTxStore.java
Author: dkulp
Date: Mon Jul 9 20:29:06 2012
New Revision: 1359379
URL: http://svn.apache.org/viewvc?rev=1359379&view=rev
Log:
Merged revisions 1359285 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1359285 | dkulp | 2012-07-09 13:06:46 -0400 (Mon, 09 Jul 2012) | 2 lines
Fix ignorable NPE stack traces in tests
........
Modified:
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/Messages.properties
cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/Messages.properties?rev=1359379&r1=1359378&r2=1359379&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/Messages.properties (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/Messages.properties Mon Jul 9 20:29:06 2012
@@ -24,4 +24,5 @@ CLOSE_FAILED_MSG = Failed to close conne
RECONNECT_WAIT_MSG = Waiting for the next reconnect attempt.
SELECT_DEST_SEQ_FAILED_MSG = Failed to retrieve destination sequences from persistent store.
SELECT_SRC_SEQ_FAILED_MSG = Failed to retrieve source sequences from persistent store.
-VERIFY_TABLE_FAILED_MSG = Failed to verify the table definition.
\ No newline at end of file
+VERIFY_TABLE_FAILED_MSG = Failed to verify the table definition.
+INITIALIZATION_FAILED_MSG = Failed to initialize RMTxStore.
\ No newline at end of file
Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=1359379&r1=1359378&r2=1359379&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java Mon Jul 9 20:29:06 2012
@@ -877,7 +877,7 @@ public class RMTxStore implements RMStor
}
}
} finally {
- if (connection == null) {
+ if (connection == null && con != null) {
con.close();
}
}
@@ -1068,7 +1068,6 @@ public class RMTxStore implements RMStor
cacheStatements();
}
} catch (SQLException ex) {
- ex.printStackTrace();
LogUtils.log(LOG, Level.SEVERE, "CONNECT_EXC", ex);
SQLException se = ex;
while (se.getNextException() != null) {
@@ -1077,7 +1076,7 @@ public class RMTxStore implements RMStor
}
throw new RMStoreException(ex);
} catch (Throwable ex) {
- ex.printStackTrace();
+ LogUtils.log(LOG, Level.SEVERE, "INITIALIZATION_FAILED_MSG", ex);
}
}