[jboss-cvs] JBoss Messaging SVN: r5987 - in trunk/src/main/org/jboss/messaging/core: server/impl and 1 other directory.

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

Author: timfox
Date: 2009-03-04 04:34:56 -0500 (Wed, 04 Mar 2009)
New Revision: 5987

Modified:
   trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
Log:
more fixes

Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java	2009-03-04 07:37:42 UTC (rev 5986)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java	2009-03-04 09:34:56 UTC (rev 5987)
@@ -117,15 +117,13 @@
       {
          try
          {
-            {
-               requestor.close();
-            }
+            requestor.close();            
          }
          catch (Exception e)
          {
             // this will happen if the remoting service is stopped before this method is called
             log.warn("Got Exception while closing requestor", e);
-         }
+         }                 
       }
    }
    // Package protected ---------------------------------------------

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-03-04 07:37:42 UTC (rev 5986)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-03-04 09:34:56 UTC (rev 5987)
@@ -267,7 +267,6 @@
       managementService.setManagementRequestTimeout(configuration.getManagementRequestTimeout());
 
       List<QueueBindingInfo> queueBindingInfos = new ArrayList<QueueBindingInfo>();
-      // List<SimpleString> destinations = new ArrayList<SimpleString>();
 
       storageManager.loadBindingJournal(queueBindingInfos);
 
@@ -336,7 +335,7 @@
       // Deploy any pre-defined queues
       deployQueues();
 
-      // Deply and pre-defined diverts
+      // Deply any pre-defined diverts
       deployDiverts();
 
       String backupConnectorName = configuration.getBackupConnectorName();
@@ -1024,7 +1023,7 @@
 
       return new CreateSessionResponseMessage(version.getIncrementingVersion());
    }
-
+   
    private Transformer instantiateTransformer(final String transformerClassName)
    {
       Transformer transformer = null;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java	2009-03-04 07:37:42 UTC (rev 5986)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java	2009-03-04 09:34:56 UTC (rev 5987)
@@ -255,8 +255,6 @@
 
          managementService.sendNotification(notification);
       }
-
-      // log.info("closed consumer with id " + id);
    }
 
    public LinkedList<MessageReference> cancelRefs(final boolean lastConsumedAsDelivered, final Transaction tx) throws Exception
@@ -265,8 +263,6 @@
 
       LinkedList<MessageReference> refs = new LinkedList<MessageReference>();
 
-      // log.info(System.identityHashCode(this) + " cancelling refs");
-
       if (!deliveringRefs.isEmpty())
       {
          for (MessageReference ref : deliveringRefs)
@@ -379,7 +375,7 @@
          return null;
       }
 
-      // Expiries can come in our of sequence with respect to delivery order
+      // Expiries can come in out of sequence with respect to delivery order
 
       Iterator<MessageReference> iter = deliveringRefs.iterator();
 
@@ -413,8 +409,8 @@
 
    public void deliverReplicated(final long messageID) throws Exception
    {
-      MessageReference ref = messageQueue.removeFirstReference(id);
-      
+      MessageReference ref = messageQueue.removeReferenceWithID(messageID);
+
       if (ref == null)
       {
          throw new IllegalStateException("Cannot find ref when replicating delivery " + messageID +
@@ -461,7 +457,6 @@
 
    // Private --------------------------------------------------------------------------------------
    
-   
    private void promptDelivery()
    {
       lock.lock();