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/09/14 15:38:05 UTC

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

Author: ay
Date: Fri Sep 14 13:38:05 2012
New Revision: 1384774

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

........
  r1384769 | ay | 2012-09-14 15:33:32 +0200 (Fri, 14 Sep 2012) | 1 line
  
  make visibility of related methods in RMTxStore consistent
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

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=1384774&r1=1384773&r2=1384774&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 Fri Sep 14 13:38:05 2012
@@ -1019,14 +1019,14 @@ public class RMTxStore implements RMStor
     }
 
     
-    private void cacheStatement(Connection con, String sql) 
+    protected void cacheStatement(Connection con, String sql) 
         throws SQLException {
         PreparedStatement stmt = con.prepareStatement(sql);
         cachedStatements.put(sql, stmt);
         statementLocks.put(stmt, new ReentrantLock());
     }
     
-    private void cacheStatements() throws SQLException {
+    protected void cacheStatements() throws SQLException {
         if (connection == null) {
             // if the connection is not held, no statement is cached.
             return;