Author: ay Date: Mon Oct 15 14:09:28 2012 New Revision: 1398296 URL: http://svn.apache.org/viewvc?rev=1398296&view=rev Log: Merged revisions 1398292 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1398292 | ay | 2012-10-15 16:01:32 +0200 (Mon, 15 Oct 2012) | 9 lines Merged revisions 1398285 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1398285 | ay | 2012-10-15 15:36:46 +0200 (Mon, 15 Oct 2012) | 1 line clean up for some sonar issues ........ ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java Propchange: cxf/branches/2.5.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.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.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=1398296&r1=1398295&r2=1398296&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java Mon Oct 15 14:09:28 2012 @@ -741,6 +741,7 @@ public class RMTxStore implements RMStor for (int i = 0; i < SET_SCHEMA_STMT_STRS.length; i++) { try { stmt.executeUpdate(MessageFormat.format(SET_SCHEMA_STMT_STRS[i], schemaName)); + ex0 = null; break; } catch (SQLException ex) { ex.setNextException(ex0); @@ -901,4 +902,4 @@ public class RMTxStore implements RMStor return (null != tableExistsState && tableExistsState.equals(ex.getSQLState())) || tableExistsCode == ex.getErrorCode(); } -} \ No newline at end of file +} Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java?rev=1398296&r1=1398295&r2=1398296&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java Mon Oct 15 14:09:28 2012 @@ -615,14 +615,14 @@ public class RetransmissionQueueImpl imp /** * Cancel further resend (although no ACK has been received). */ - protected void cancel() { + protected synchronized void cancel() { if (null != nextTask) { nextTask.cancel(); releaseSavedMessage(); } } - protected void suspend() { + protected synchronized void suspend() { suspended = true; pending = false; //TODO release the message and later reload it upon resume @@ -632,7 +632,7 @@ public class RetransmissionQueueImpl imp } } - protected void resume() { + protected synchronized void resume() { suspended = false; next = new Date(System.currentTimeMillis()); attempted();
