Author: dkulp Date: Thu Oct 27 20:29:08 2011 New Revision: 1190001 URL: http://svn.apache.org/viewvc?rev=1190001&view=rev Log: Merged revisions 1189305 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1189305 | ay | 2011-10-26 12:47:20 -0400 (Wed, 26 Oct 2011) | 9 lines Merged revisions 1189301 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1189301 | ay | 2011-10-26 18:35:48 +0200 (Wed, 26 Oct 2011) | 1 line [CXF-3853] changed RMTxStore.isTableExistsError to protected ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.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.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=1190001&r1=1190000&r2=1190001&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java (original) +++ cxf/branches/2.3.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java Thu Oct 27 20:29:08 2011 @@ -683,7 +683,7 @@ public class RMTxStore implements RMStor } } - private static boolean isTableExistsError(SQLException ex) { + protected boolean isTableExistsError(SQLException ex) { return DERBY_TABLE_EXISTS_STATE.equals(ex.getSQLState()) || ORACLE_TABLE_EXISTS_CODE == ex.getErrorCode(); }
