[jboss-cvs] JBossAS SVN: r63141 - branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2007-05-18 06:51:32 -0400 (Fri, 18 May 2007)
New Revision: 63141

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java
Log:
JBAS-4427

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java	2007-05-18 10:47:44 UTC (rev 63140)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java	2007-05-18 10:51:32 UTC (rev 63141)
@@ -69,7 +69,7 @@
    private final JDBCAbstractEntityBridge entity;
    private final JDBCEntityMetaData entityMetaData;
    private final Logger log;
-   private static int idxCount = 0;
+   private int idxCount = 0;
 
    public JDBCStartCommand(JDBCEntityPersistenceStore manager)
    {
@@ -82,6 +82,9 @@
          "." +
          manager.getMetaData().getName());
 
+      // Start index counter at 1
+      idxCount = 1;
+
       // Create the created tables set
       Set tables = (Set) manager.getApplicationData(CREATED_TABLES_KEY);
       if(tables == null)
@@ -962,11 +965,11 @@
       }
    }
 
-   private static String createIndexSQL(JDBCCMPFieldMetaData fi, String tableName)
+   private String createIndexSQL(JDBCCMPFieldMetaData fi, String tableName)
    {
       StringBuffer sql = new StringBuffer();
       sql.append(SQLUtil.CREATE_INDEX);
-      sql.append(fi.getColumnName() + IDX_POSTFIX + idxCount);
+      sql.append(tableName + IDX_POSTFIX + idxCount);
       sql.append(SQLUtil.ON);
       sql.append(tableName + " (");
       sql.append(fi.getColumnName());
@@ -1187,7 +1190,7 @@
     * @param in
     * @return
     */
-   private static String replaceIndexCounter(String in)
+   private String replaceIndexCounter(String in)
    {
       int pos;