[jboss-cvs] JBossCache/src/org/jboss/cache/pojo/jmx ...

[Manik Surtani]

  User: msurtani
  Date: 07/05/23 06:28:56

  Modified:    src/org/jboss/cache/pojo/jmx    JmxUtil.java
                        PojoCacheLegacyJmxWrapper.java
                        PojoCacheJmxWrapper.java
  Log:
  Initiated a bunch of performance fixes, including replacing CopyOnWriteArraySets with org.jboss.cache.util.concurrent.ConcurrentHashSet.
  Also ran an imports optimiser on the code base - there were a lot of unused imports floating about.
  
  Revision  Changes    Path
  1.5       +7 -8      JBossCache/src/org/jboss/cache/pojo/jmx/JmxUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JmxUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/jmx/JmxUtil.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- JmxUtil.java	11 May 2007 22:42:10 -0000	1.4
  +++ JmxUtil.java	23 May 2007 10:28:56 -0000	1.5
  @@ -7,17 +7,16 @@
   
   package org.jboss.cache.pojo.jmx;
   
  -import java.util.Hashtable;
  -
   import javax.management.MBeanServer;
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
  +import java.util.Hashtable;
   
   /**
    * Various JMX related utilities
    *
    * @author Ben Wang
  - * @version $Id: JmxUtil.java,v 1.4 2007/05/11 22:42:10 bstansberry Exp $
  + * @version $Id: JmxUtil.java,v 1.5 2007/05/23 10:28:56 msurtani Exp $
    */
   public class JmxUtil extends org.jboss.cache.jmx.JmxUtil
   {
  
  
  
  1.3       +19 -21    JBossCache/src/org/jboss/cache/pojo/jmx/PojoCacheLegacyJmxWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCacheLegacyJmxWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/jmx/PojoCacheLegacyJmxWrapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PojoCacheLegacyJmxWrapper.java	23 May 2007 05:22:26 -0000	1.2
  +++ PojoCacheLegacyJmxWrapper.java	23 May 2007 10:28:56 -0000	1.3
  @@ -21,10 +21,6 @@
    */
   package org.jboss.cache.pojo.jmx;
   
  -import javax.management.MBeanServer;
  -import javax.management.ObjectName;
  -import javax.transaction.TransactionManager;
  -
   import org.jboss.cache.CacheException;
   import org.jboss.cache.config.BuddyReplicationConfig;
   import org.jboss.cache.config.CacheLoaderConfig;
  @@ -37,13 +33,17 @@
   import org.jgroups.ChannelFactory;
   import org.w3c.dom.Element;
   
  +import javax.management.MBeanServer;
  +import javax.management.ObjectName;
  +import javax.transaction.TransactionManager;
  +
   /**
    * {@link PojoCacheJmxWrapper} subclass that supports building the
    * {@link Configuration} from MBean attribute injection.  Allows
    * configuration of the cache using the JBoss AS 4.x JMX microkernel.
    *
    * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class PojoCacheLegacyJmxWrapper extends PojoCacheJmxWrapper 
      implements PojoCacheLegacyJmxWrapperMBean
  @@ -95,7 +95,7 @@
               Channel ch;
               try
               {
  -               ch = (Channel) mbs.invoke(multiplexerService, "createMultiplexerChannel", new Object[] { cfg.getMultiplexerStack(), cfg.getClusterName() }, new String[] { String.class.getName(), String.class.getName() });
  +               ch = (Channel) mbs.invoke(multiplexerService, "createMultiplexerChannel", new Object[]{cfg.getMultiplexerStack(), cfg.getClusterName()}, new String[]{String.class.getName(), String.class.getName()});
               }
               catch (Exception e)
               {
  @@ -174,7 +174,6 @@
      }
      
      /**
  -    * 
       * @deprecated directly inject the ChannelFactory via {@link #setMuxChannelFactory(ChannelFactory)}
       */
      public ObjectName getMultiplexerService()
  @@ -342,7 +341,6 @@
      }
      
      /**
  -    * 
       * @deprecated directly inject the ChannelFactory via {@link #setMuxChannelFactory(ChannelFactory)}
       */
      public void setMultiplexerService(ObjectName muxService)
  
  
  
  1.9       +63 -64    JBossCache/src/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCacheJmxWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/pojo/jmx/PojoCacheJmxWrapper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- PojoCacheJmxWrapper.java	23 May 2007 01:36:46 -0000	1.8
  +++ PojoCacheJmxWrapper.java	23 May 2007 10:28:56 -0000	1.9
  @@ -21,11 +21,6 @@
    */
   package org.jboss.cache.pojo.jmx;
   
  -import javax.management.JMException;
  -import javax.management.MBeanRegistration;
  -import javax.management.MBeanServer;
  -import javax.management.ObjectName;
  -
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.CacheException;
  @@ -40,6 +35,11 @@
   import org.jboss.cache.pojo.PojoCacheFactory;
   import org.jboss.cache.pojo.impl.PojoCacheImpl;
   
  +import javax.management.JMException;
  +import javax.management.MBeanRegistration;
  +import javax.management.MBeanServer;
  +import javax.management.ObjectName;
  +
   public class PojoCacheJmxWrapper
      implements PojoCacheJmxWrapperMBean, MBeanRegistration
   {
  @@ -59,7 +59,6 @@
   
      /**
       * Default constructor.
  -    *
       */
      public PojoCacheJmxWrapper()
      {      
  @@ -339,7 +338,7 @@
      {
         pojoCache = (PojoCacheImpl) PojoCacheFactory.createCache(config, false);
         
  -      plainCacheWrapper= buildPlainCacheWrapper(pojoCache);
  +      plainCacheWrapper = buildPlainCacheWrapper(pojoCache);
         
         selfConstructed = true;
      }