svn commit: r809738 - /cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java

[eglynn]

Author: eglynn
Date: Mon Aug 31 20:46:42 2009
New Revision: 809738

URL: http://svn.apache.org/viewvc?rev=809738&view=rev
Log:
[CXF-2407] Patch applied on behalf of Dan Ryazansky, with thanks.

Modified:
    
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java

Modified: 
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=809738&r1=809737&r2=809738&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
 (original)
+++ 
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
 Mon Aug 31 20:46:42 2009
@@ -74,9 +74,9 @@
     private static final String CREATE_SRC_SEQUENCES_TABLE_STMT =
         "CREATE TABLE CXF_RM_SRC_SEQUENCES " 
         + "(SEQ_ID VARCHAR(256) NOT NULL, "
-        + "CUR_MSG_NO DECIMAL(31, 0) NOT NULL DEFAULT 1, "
+        + "CUR_MSG_NO DECIMAL(31, 0) DEFAULT 1 NOT NULL, "
         + "LAST_MSG CHAR(1), "
-        + "EXPIRY BIGINT, " 
+        + "EXPIRY DECIMAL(31, 0), "
         + "OFFERING_SEQ_ID VARCHAR(256), "
         + "ENDPOINT_ID VARCHAR(1024), "            
         + "PRIMARY KEY (SEQ_ID))";
@@ -115,6 +115,9 @@
         + "WHERE ENDPOINT_ID = ?";
     private static final String SELECT_MESSAGES_STMT_STR =
         "SELECT MSG_NO, SEND_TO, CONTENT FROM {0} WHERE SEQ_ID = ?";
+
+    private static final String DERBY_TABLE_EXISTS_STATE = "X0Y32";
+    private static final int ORACLE_TABLE_EXISTS_CODE = 955;
     
     private static final Logger LOG = LogUtils.getL7dLogger(RMTxStore.class);
     
@@ -540,7 +543,7 @@
         try {
             stmt.executeUpdate(CREATE_SRC_SEQUENCES_TABLE_STMT);
         } catch (SQLException ex) {
-            if (!"X0Y32".equals(ex.getSQLState())) {
+            if (!isTableExistsError(ex)) {
                 throw ex;
             } else {
                 LOG.fine("Table CXF_RM_SRC_SEQUENCES already exists.");
@@ -552,7 +555,7 @@
         try {
             stmt.executeUpdate(CREATE_DEST_SEQUENCES_TABLE_STMT);
         } catch (SQLException ex) {
-            if (!"X0Y32".equals(ex.getSQLState())) {
+            if (!isTableExistsError(ex)) {
                 throw ex;
             } else {
                 LOG.fine("Table CXF_RM_DEST_SEQUENCES already exists.");
@@ -565,7 +568,7 @@
             try {
                 
stmt.executeUpdate(MessageFormat.format(CREATE_MESSAGES_TABLE_STMT, tableName));
             } catch (SQLException ex) {
-                if (!"X0Y32".equals(ex.getSQLState())) {
+                if (!isTableExistsError(ex)) {
                     throw ex;
                 } else {
                     if (LOG.isLoggable(Level.FINE)) {
@@ -668,6 +671,10 @@
         }
     }
 
+    private static boolean isTableExistsError(SQLException ex) {
+        return DERBY_TABLE_EXISTS_STATE.equals(ex.getSQLState())
+                || ORACLE_TABLE_EXISTS_CODE == ex.getErrorCode();
+    }
 
 
 }