Author: ay Date: Tue Apr 3 17:56:55 2012 New Revision: 1309074 URL: http://svn.apache.org/viewvc?rev=1309074&view=rev Log: Merged revisions 1309073 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1309073 | ay | 2012-04-03 19:52:14 +0200 (Tue, 03 Apr 2012) | 9 lines Merged revisions 1309068 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1309068 | ay | 2012-04-03 19:44:46 +0200 (Tue, 03 Apr 2012) | 1 line utilize the existing rmstore methods for sequence only updates ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java?rev=1309074&r1=1309073&r2=1309074&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java Tue Apr 3 17:56:55 2012 @@ -140,13 +140,12 @@ public class Destination extends Abstrac RMStore store = getReliableEndpoint().getManager().getStore(); if (null != store) { - CachedOutputStream saved = null; + RMMessage msg = null; if (!MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))) { - saved = (CachedOutputStream)message.get(RMMessageConstants.SAVED_CONTENT); + msg = new RMMessage(); + msg.setContent((CachedOutputStream)message.get(RMMessageConstants.SAVED_CONTENT)); + msg.setMessageNumber(sequenceType.getMessageNumber()); } - RMMessage msg = new RMMessage(); - msg.setMessageNumber(sequenceType.getMessageNumber()); - msg.setContent(saved); store.persistIncoming(seq, msg); } Modified: cxf/branches/2.4.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.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=1309074&r1=1309073&r2=1309074&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java Tue Apr 3 17:56:55 2012 @@ -472,7 +472,7 @@ public class RMTxStore implements RMStor updateDestinationSequence(seq); - if (msg.getCachedOutputStream() != null) { + if (msg != null && msg.getCachedOutputStream() != null) { storeMessage(seq.getIdentifier(), msg, false); } @@ -492,7 +492,7 @@ public class RMTxStore implements RMStor updateSourceSequence(seq); - if (msg.getCachedOutputStream() != null) { + if (msg != null && msg.getCachedOutputStream() != null) { storeMessage(seq.getIdentifier(), msg, true); }
