[jboss-cvs] JBoss Messaging SVN: r1937 - in trunk: src/main/org/jboss/jms/client/state and 11 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 9 21:38:11 EST 2007


Author: ovidiu.feodorov at jboss.com
Date: 2007-01-09 21:38:01 -0500 (Tue, 09 Jan 2007)
New Revision: 1937

Modified:
   trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java
   trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java
   trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
   trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
   trunk/src/main/org/jboss/jms/message/JBossMessage.java
   trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/src/main/org/jboss/messaging/core/Channel.java
   trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java
   trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/crash/CallbackFailureTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java
Log:
minor refactoring

Modified: trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -123,7 +123,7 @@
 
             ConnectionState state = (ConnectionState)((DelegateSupport)cd).getState();
 
-            state.configureFailoverCommandCenter();
+            state.initializeFailoverCommandCenter();
 
             FailoverCommandCenter fcc = state.getFailoverCommandCenter();
 

Modified: trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -9,11 +9,8 @@
 import org.jboss.remoting.ConnectionListener;
 import org.jboss.remoting.Client;
 import org.jboss.logging.Logger;
-import org.jboss.jms.client.delegate.ClientConnectionDelegate;
-import org.jboss.jms.client.FailoverEvent;
 import org.jboss.jms.client.FailoverCommandCenter;
 import org.jboss.jms.client.remoting.JMSRemotingConnection;
-import org.jboss.jms.client.state.ConnectionState;
 
 /**
  * The listener that detects a connection failure and initiates the failover process. Each physical
@@ -36,11 +33,11 @@
 
    private FailoverCommandCenter fcc;
 
-   // The remotingConnection is needed here to validate that the failure wasn't captured after failover
-   // was already called
+   // The remoting connection is needed here to validate that the failure wasn't captured after
+   // failover was already called
    private JMSRemotingConnection remotingConnection;
 
-      // Constructors ---------------------------------------------------------------------------------
+   // Constructors ---------------------------------------------------------------------------------
 
    ConnectionFailureListener(FailoverCommandCenter fcc, JMSRemotingConnection remotingConnection)
    {

Modified: trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -46,7 +46,8 @@
 
    private DelegateSupport delegate;
 
-   // We need to cache connectionState here, as fcc could be null for nonClusteredConnections
+   // We need to cache connectionState here, as FailureCommandCenter instance could be null for
+   // non-clustered connections
    private ConnectionState connectionState;
    private FailoverCommandCenter fcc;
    private FailoverValve valve;
@@ -63,9 +64,8 @@
    public Object invoke(Invocation invocation) throws Throwable
    {
 
-      // maintain a reference to connectionState, so we can ensure we have already
-      // tested for fcc.
-      // As fcc can be null on nonClusteredConnections we have to cache connectionState instead
+      // maintain a reference to connectionState, so we can ensure we have already tested for fcc.
+      // As fcc can be null on non-clustered connections we have to cache connectionState instead
       if (connectionState == null)
       {
          delegate = (DelegateSupport)invocation.getTargetObject();
@@ -87,7 +87,7 @@
          }
       }
 
-      // non clustered.. noop
+      // non clustered, send the invocation forward
       if (fcc == null)
       {
          return invocation.invokeNext();

Modified: trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ConnectionState.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/client/state/ConnectionState.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -258,11 +258,9 @@
       return fcc;
    }
 
-
-   /** Creates the FailoverCommandCenter as this is a clustered Connection*/
-   public void configureFailoverCommandCenter()
+   public void initializeFailoverCommandCenter()
    {
-      this.fcc = new FailoverCommandCenter(this);
+      fcc = new FailoverCommandCenter(this);
    }
 
    public String toString()

Modified: trunk/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -50,7 +50,6 @@
 import org.jboss.jms.destination.JBossTemporaryTopic;
 import org.jboss.jms.destination.JBossTopic;
 import org.jboss.jms.util.MessagingJMSException;
-import org.jboss.logging.Logger;
 import org.jboss.messaging.core.message.MessageSupport;
 import org.jboss.messaging.util.StreamUtils;
 import org.jboss.util.Primitives;
@@ -99,9 +98,6 @@
    
    public static final String JMS_JBOSS_SCHEDULED_DELIVERY_PROP_NAME = "JMS_JBOSS_SCHEDULED_DELIVERY";
    
-   private static final Logger log = Logger.getLogger(JBossMessage.class);
-
-
    // Static --------------------------------------------------------
 
    private static final HashSet reservedIdentifiers = new HashSet();

Modified: trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -699,8 +699,7 @@
    protected Serializable readPayload(DataInputStream in, int length)
       throws Exception
    {
-      ArrayList l = StreamUtils.readList(in);
-      return l;
+      return StreamUtils.readList(in);
    }
 
    // Private -------------------------------------------------------

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -172,7 +172,9 @@
    {
       try
       {
-         log.debug(this + " creating " + (transacted ? "transacted" : "non transacted") + " session, " + ToString.acknowledgmentMode(acknowledgmentMode) + ", " + (isXA ? "XA": "non XA"));
+         log.debug(this + " creating " + (transacted ? "transacted" : "non transacted") +
+            " session, " + ToString.acknowledgmentMode(acknowledgmentMode) + ", " +
+            (isXA ? "XA": "non XA"));
 
          if (closed)
          {
@@ -319,9 +321,11 @@
                {     
                   postOffice.unbindQueue(dest.getName()); 
                   
-                  String counterName = ServerSessionEndpoint.TEMP_QUEUE_MESSAGECOUNTER_PREFIX + dest.getName();
+                  String counterName =
+                     ServerSessionEndpoint.TEMP_QUEUE_MESSAGECOUNTER_PREFIX + dest.getName();
                   
-                  MessageCounter counter = serverPeer.getMessageCounterManager().unregisterMessageCounter(counterName);
+                  MessageCounter counter =
+                     serverPeer.getMessageCounterManager().unregisterMessageCounter(counterName);
                   
                   if (counter == null)
                   {
@@ -487,7 +491,8 @@
       
       this.jmsClientVMId = jmsClientVMId;
       
-      this.serverPeer.getConnectionManager().registerConnection(jmsClientVMId, remotingClientSessionId, this);
+      this.serverPeer.getConnectionManager().
+         registerConnection(jmsClientVMId, remotingClientSessionId, this);
    }
    
    public void setUsingVersion(byte version)

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -37,7 +37,6 @@
 import javax.jms.IllegalStateException;
 import javax.jms.InvalidDestinationException;
 import javax.jms.JMSException;
-import javax.jms.Message;
 
 import org.jboss.jms.client.delegate.ClientBrowserDelegate;
 import org.jboss.jms.client.delegate.ClientConsumerDelegate;
@@ -468,11 +467,13 @@
             
             JMSCondition cond = (JMSCondition)binding.getCondition();                        
             
-            ManagedDestination dest = sp.getDestinationManager().getDestination(cond.getName(), cond.isQueue());
+            ManagedDestination dest =
+               sp.getDestinationManager().getDestination(cond.getName(), cond.isQueue());
             
             if (dest == null)
             {
-               throw new IllegalStateException("Cannot find managed destination with name " + cond.getName() + " isQueue" + cond.isQueue());
+               throw new IllegalStateException("Cannot find managed destination with name " +
+                  cond.getName() + " isQueue" + cond.isQueue());
             }
             
             Queue dlqToUse =
@@ -499,7 +500,9 @@
                
                if (trace) { log.trace(this + " Recovered delivery " + deliveryId + ", " + del); }
                
-               deliveries.put(new Long(deliveryId), new DeliveryRecord(del, -1, dlqToUse, expiryQueueToUse, dest.getRedeliveryDelay()));
+               deliveries.put(new Long(deliveryId),
+                              new DeliveryRecord(del, -1, dlqToUse,
+                                                 expiryQueueToUse, dest.getRedeliveryDelay()));
             }
          }
          
@@ -521,7 +524,8 @@
          }
          if (!dest.isTemporary())
          {
-            throw new InvalidDestinationException("Destination:" + dest + " is not a temporary destination");
+            throw new InvalidDestinationException("Destination:" + dest +
+               " is not a temporary destination");
          }
          connectionEndpoint.addTemporaryDestination(dest);
          
@@ -554,7 +558,9 @@
                         
             String counterName = TEMP_QUEUE_MESSAGECOUNTER_PREFIX + dest.getName();
             
-            MessageCounter counter = new MessageCounter(counterName, null, q, false, false, sp.getDefaultMessageCounterHistoryDayLimit());
+            MessageCounter counter =
+               new MessageCounter(counterName, null, q, false, false,
+                                  sp.getDefaultMessageCounterHistoryDayLimit());
             
             sp.getMessageCounterManager().registerMessageCounter(counterName, counter);
                                  
@@ -579,7 +585,8 @@
    
          if (!dest.isTemporary())
          {
-            throw new InvalidDestinationException("Destination:" + dest + " is not a temporary destination");
+            throw new InvalidDestinationException("Destination:" + dest +
+               " is not a temporary destination");
          }
          
          ManagedDestination mDest = dm.getDestination(dest.getName(), dest.isQueue());
@@ -598,7 +605,8 @@
             
             connectionEndpoint.removeTemporaryDestination(dest);
             
-            MessageCounter counter = sp.getMessageCounterManager().unregisterMessageCounter(counterName);  
+            MessageCounter counter =
+               sp.getMessageCounterManager().unregisterMessageCounter(counterName);
             
             if (counter == null)
             {
@@ -608,11 +616,13 @@
          else
          {
             //Topic            
-            Collection bindings = postOffice.getBindingsForCondition(new JMSCondition(false, dest.getName()));
+            Collection bindings =
+               postOffice.getBindingsForCondition(new JMSCondition(false, dest.getName()));
             
             if (!bindings.isEmpty())
             {
-               throw new IllegalStateException("Cannot delete temporary destination, since it has active consumer(s)");
+               throw new IllegalStateException("Cannot delete temporary destination, " +
+                  "since it has active consumer(s)");
             }
          }
          
@@ -742,7 +752,8 @@
       }
    }
       
-   void cancelDeliveriesForConsumerAfterDeliveryId(int consumerId, long lastDeliveryId) throws Throwable
+   void cancelDeliveriesForConsumerAfterDeliveryId(int consumerId, long lastDeliveryId)
+      throws Throwable
    {
       //Need to cancel in reverse
       
@@ -1069,7 +1080,8 @@
          }
          else
          {
-            log.warn("Cannot move to destination since destination has not been deployed! The message will be removed");
+            log.warn("Cannot move to destination since destination has not been deployed! " +
+               "The message will be removed");
             
             del.acknowledge(tx);
          }             
@@ -1293,11 +1305,12 @@
             }
             else
             {
-               q = new LocalClusteredQueue(postOffice, nodeId, new GUID().toString(), idm.getID(), ms, pm, true, false,
-                        executor, mDest.getMaxSize(), selector, tr,
-                        mDest.getFullSize(),
-                        mDest.getPageSize(),
-                        mDest.getDownCacheSize());
+               q = new LocalClusteredQueue(postOffice, nodeId, new GUID().toString(),
+                                           idm.getID(), ms, pm, true, false,
+                                           executor, mDest.getMaxSize(), selector, tr,
+                                           mDest.getFullSize(),
+                                           mDest.getPageSize(),
+                                           mDest.getDownCacheSize());
                
                ClusteredPostOffice cpo = (ClusteredPostOffice)postOffice;
                

Modified: trunk/src/main/org/jboss/messaging/core/Channel.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/Channel.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/messaging/core/Channel.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -122,7 +122,6 @@
    
    /**
     * Count scheduled for delivery
-    * @return
     */
    int getScheduledCount();
    

Modified: trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -340,7 +340,6 @@
       payload = payloadAsByteArray;
    }
 
-
    // Private -------------------------------------------------------
 
    // Inner classes -------------------------------------------------

Modified: trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -183,10 +183,8 @@
             assertEquals("message" + i, tm.getText());
          }
          
-         //Now close the session
- 
-         long now = System.currentTimeMillis();
-         
+         // Now close the session
+
          sess2.close();
          
       }

Modified: trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -1179,9 +1179,6 @@
 
    }
    
-   
-   
-   
    // Package protected ---------------------------------------------
    
    // Protected -----------------------------------------------------

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -31,8 +31,8 @@
  * Regression Tests for a dead lock condition fixed on FailoverValve.
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>
- *          <p/>
- *          $Id$
+ *
+ * $Id$
  */
 public class FailoverValveTest extends TestCase
 {

Modified: trunk/tests/src/org/jboss/test/messaging/jms/crash/CallbackFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/crash/CallbackFailureTest.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/jms/crash/CallbackFailureTest.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -25,7 +25,6 @@
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 import org.jboss.jms.server.ConnectionManager;
-import org.jboss.logging.Logger;
 import org.jboss.test.messaging.MessagingTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;
 import org.jboss.test.messaging.tools.jmx.ServiceContainer;
@@ -48,8 +47,6 @@
 
    // Static --------------------------------------------------------
    
-   private static final Logger log = Logger.getLogger(CallbackFailureTest.class);
-   
    // Attributes ----------------------------------------------------
    
    protected Server localServer;

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -1107,7 +1107,9 @@
 
    public void testCopyOnJBossBytesMessage() throws JMSException
    {
-      JBossBytesMessage jbossBytesMessage = (JBossBytesMessage)(((MessageProxy)queueProducerSession.createBytesMessage()).getMessage());
+      JBossBytesMessage jbossBytesMessage = (JBossBytesMessage)(((MessageProxy)queueProducerSession.
+         createBytesMessage()).getMessage());
+
       for(int i = 0; i < 20; i++)
       {
          jbossBytesMessage.writeByte((byte)i);
@@ -1141,7 +1143,8 @@
 
    public void testCopyOnJBossMapMessage() throws JMSException
    {
-      JBossMapMessage jbossMapMessage = (JBossMapMessage)(((MessageProxy)queueProducerSession.createMapMessage()).getMessage());
+      JBossMapMessage jbossMapMessage = (JBossMapMessage)(((MessageProxy)queueProducerSession.
+         createMapMessage()).getMessage());
       
       jbossMapMessage.setInt("int", 1);
       jbossMapMessage.setString("string", "test");
@@ -1166,7 +1169,8 @@
 
    public void testCopyOnJBossObjectMessage() throws JMSException
    {
-      JBossObjectMessage jbossObjectMessage = (JBossObjectMessage)(((MessageProxy)queueProducerSession.createObjectMessage()).getMessage());
+      JBossObjectMessage jbossObjectMessage = (JBossObjectMessage)
+         (((MessageProxy)queueProducerSession.createObjectMessage()).getMessage());
       
       JBossObjectMessage copy = new JBossObjectMessage(jbossObjectMessage);
 
@@ -1186,7 +1190,8 @@
 
    public void testCopyOnJBossStreamMessage() throws JMSException
    {
-      JBossStreamMessage jbossStreamMessage = (JBossStreamMessage)(((MessageProxy)queueProducerSession.createStreamMessage()).getMessage());
+      JBossStreamMessage jbossStreamMessage = (JBossStreamMessage)
+         (((MessageProxy)queueProducerSession.createStreamMessage()).getMessage());
       
       jbossStreamMessage.writeByte((byte)1);
       jbossStreamMessage.writeByte((byte)2);
@@ -1213,7 +1218,8 @@
 
    public void testCopyOnJBossTextMessage() throws JMSException
    {
-      JBossTextMessage jbossTextMessage = (JBossTextMessage)(((MessageProxy)queueProducerSession.createTextMessage()).getMessage());
+      JBossTextMessage jbossTextMessage = (JBossTextMessage)
+         (((MessageProxy)queueProducerSession.createTextMessage()).getMessage());
       
       JBossTextMessage copy = new JBossTextMessage(jbossTextMessage);
 
@@ -1230,16 +1236,12 @@
       ensureEquivalent(foreignTextMessage, copy);
    }
 
-
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------
 
    // Private -------------------------------------------------------
 
-   
-
-
    // Inner classes -------------------------------------------------
 
 }

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -39,7 +39,6 @@
 import javax.naming.InitialContext;
 
 import org.jboss.jms.client.JBossConnectionFactory;
-import org.jboss.jms.selector.Selector;
 import org.jboss.jms.server.destination.SubscriptionInfo;
 import org.jboss.test.messaging.jms.server.destination.base.DestinationManagementTestBase;
 import org.jboss.test.messaging.tools.ServerManagement;

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -27,7 +27,6 @@
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
-import javax.jms.MessageConsumer;
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
@@ -563,7 +562,7 @@
       
       try
       {         
-         Queue testQueue = (Queue)initialContext.lookup("/queue/testQueue");
+         initialContext.lookup("/queue/testQueue");
          
          Topic testTopic = (Topic)initialContext.lookup("/topic/testTopic");
                
@@ -581,7 +580,7 @@
          
          Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
          
-         MessageConsumer sub = sess.createConsumer(testTopic);
+         sess.createConsumer(testTopic);
          
          List counters = (List)ServerManagement.getAttribute(new ObjectName(topicON), "MessageCounters");
          

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java	2007-01-10 00:14:47 UTC (rev 1936)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java	2007-01-10 02:38:01 UTC (rev 1937)
@@ -67,9 +67,7 @@
          
          Object arr = Array.newInstance(cl, 0);
          
-         Class arrayClass = arr.getClass();
-         
-         return arrayClass;
+         return arr.getClass();
       }
       else
       {      




More information about the jboss-cvs-commits mailing list