You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/05/02 15:38:15 UTC

svn commit: r1333041 - in /cxf/branches/2.5.x-fixes: ./ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java

Author: ay
Date: Wed May  2 13:38:14 2012
New Revision: 1333041

URL: http://svn.apache.org/viewvc?rev=1333041&view=rev
Log:
Merged revisions 1333040 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1333040 | ay | 2012-05-02 15:33:48 +0200 (Wed, 02 May 2012) | 1 line
  
  forgot to delete some unnecessary lines for CXF-4276
........

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

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=1333041&r1=1333040&r2=1333041&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 Wed May  2 13:38:14 2012
@@ -562,15 +562,6 @@ public class RMTxStore implements RMStor
                     new Object[] {outbound ? "outbound" : "inbound", nr, id, to});
         }
         PreparedStatement stmt = outbound ? createOutboundMessageStmt : createInboundMessageStmt;
-        if (null == stmt) {
-            stmt = connection.prepareStatement(MessageFormat.format(CREATE_MESSAGE_STMT_STR,
-                outbound ? OUTBOUND_MSGS_TABLE_NAME : INBOUND_MSGS_TABLE_NAME));
-            if (outbound) {
-                createOutboundMessageStmt = stmt;                    
-            } else {
-                createInboundMessageStmt = stmt;
-            }
-        }
         int i = 1;
         stmt.setString(i++, id);  
         stmt.setLong(i++, nr);