[jboss-cvs] JBoss Messaging SVN: r4068 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP: tests/src/org/jboss/test/messaging/tools/container and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2008-04-16 12:17:55 -0400 (Wed, 16 Apr 2008)
New Revision: 4068

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/tools/container/ClassLoaderJMXWrapper.java
Log:
Catching up with relevant Stable changes up to revision 4051 - including the classloading change on the testsuite and HSQLDB fixes on small mistakes

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2008-04-16 15:37:57 UTC (rev 4067)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2008-04-16 16:17:55 UTC (rev 4068)
@@ -2556,7 +2556,7 @@
       map.put("CREATE_COUNTER",
               "CREATE TABLE JBM_COUNTER (NAME VARCHAR(255), NEXT_ID BIGINT, PRIMARY KEY(NAME))");
       // Id cache
-      map.put("CREATE_ID_CACHE", "CREATE TABLE JBM_ID_CACHE (NODE_ID INTEGER, CNTR INTEGER, JBM_ID VARCHAR(255), PRIMARY KEY(NODEID, CNTR))");
+      map.put("CREATE_ID_CACHE", "CREATE TABLE JBM_ID_CACHE (NODE_ID INTEGER, CNTR INTEGER, JBM_ID VARCHAR(255), PRIMARY KEY(NODE_ID, CNTR))");
       return map;
    }
 
@@ -2603,8 +2603,8 @@
               "UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE CHANNEL_ID = ?");
       map.put("MOVE_REFERENCE",
               "UPDATE JBM_MSG_REF SET CHANNEL_ID = ? WHERE MESSAGE_ID = ? AND CHANNEL_ID = ?");
-      map.put("LOAD_ID_CACHE", "SELECT CNTR, ID FROM JBM_ID_CACHE WHERE NODE_ID = ?");
-      map.put("UPDATE_ID_IN_CACHE", "UPDATE JBM_ID_CACHE SET JBM_ID = ? WHERE NODE_ID = ? CNTR = ?");
+      map.put("LOAD_ID_CACHE", "SELECT CNTR, JBM_ID FROM JBM_ID_CACHE WHERE NODE_ID = ?");
+      map.put("UPDATE_ID_IN_CACHE", "UPDATE JBM_ID_CACHE SET JBM_ID = ? WHERE NODE_ID = ? AND CNTR = ?");
       map.put("INSERT_ID_IN_CACHE", "INSERT INTO JBM_ID_CACHE (NODE_ID, CNTR, JBM_ID) VALUES (?, ?, ?)");
 
 

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/tools/container/ClassLoaderJMXWrapper.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/tools/container/ClassLoaderJMXWrapper.java	2008-04-16 15:37:57 UTC (rev 4067)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/tools/container/ClassLoaderJMXWrapper.java	2008-04-16 16:17:55 UTC (rev 4068)
@@ -21,9 +21,7 @@
 */
 package org.jboss.test.messaging.tools.container;
 
-import java.lang.reflect.Array;
-import java.net.URL;
-import java.net.URLClassLoader;
+import org.jboss.util.loading.DelegatingClassLoader;
 
 /**
  * We extend URLClassLoader just to prevent UnifiedLoaderRepository3 to generate spurious warning
@@ -35,7 +33,7 @@
  *
  * $Id$
  */
-public class ClassLoaderJMXWrapper extends URLClassLoader implements ClassLoaderJMXWrapperMBean
+public class ClassLoaderJMXWrapper extends DelegatingClassLoader implements ClassLoaderJMXWrapperMBean
 {
    // Constants -----------------------------------------------------
 
@@ -43,45 +41,13 @@
 
    // Attributes ----------------------------------------------------
 
-   private ClassLoader delegate;
-
    // Constructors --------------------------------------------------
 
    public ClassLoaderJMXWrapper(ClassLoader delegate)
    {
-      super(new URL[0]);
-      this.delegate = delegate;
+      super(delegate);
    }
 
-   // ClassLoaderJMXWrapperMBean implementation ---------------------
-
-   public Class loadClass(String name) throws ClassNotFoundException
-   {
-      if (name.endsWith("[]"))
-      {
-         name = name.substring(0, name.length() - 2);
-         
-         //The classloader of an array type is the classloader of it's element (if non primitive)
-         
-         Class cl = delegate.loadClass(name);
-         
-         Object arr = Array.newInstance(cl, 0);
-         
-         return arr.getClass();
-      }
-      else
-      {      
-         return delegate.loadClass(name);
-      }
-   }
-
-   // ClassLoader overrides -----------------------------------------
-
-   public URL getResource(String name)
-   {
-      return delegate.getResource(name);
-   }
-
    // Public --------------------------------------------------------
 
    // Package protected ---------------------------------------------