[jboss-cvs] JBoss Messaging SVN: r7880 - in branches/JBMESSAGING-1742/src/main/org/jboss: messaging/core/impl/postoffice and 1 other directory.

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

Author: gaohoward
Date: 2009-10-28 12:28:08 -0400 (Wed, 28 Oct 2009)
New Revision: 7880

Modified:
   branches/JBMESSAGING-1742/src/main/org/jboss/jms/server/destination/TopicService.java
   branches/JBMESSAGING-1742/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
remove logger


Modified: branches/JBMESSAGING-1742/src/main/org/jboss/jms/server/destination/TopicService.java
===================================================================
--- branches/JBMESSAGING-1742/src/main/org/jboss/jms/server/destination/TopicService.java	2009-10-28 16:06:30 UTC (rev 7879)
+++ branches/JBMESSAGING-1742/src/main/org/jboss/jms/server/destination/TopicService.java	2009-10-28 16:28:08 UTC (rev 7880)
@@ -16,7 +16,6 @@
 import org.jboss.jms.server.messagecounter.MessageCounter;
 import org.jboss.messaging.core.contract.PostOffice;
 import org.jboss.messaging.core.contract.Queue;
-import org.jboss.messaging.core.impl.postoffice.DebugLogger;
 import org.jboss.messaging.util.ExceptionUtil;
 import org.jboss.messaging.util.MessageQueueNameHelper;
 import org.jboss.messaging.util.XMLUtil;
@@ -39,7 +38,6 @@
    
    public static final String SUBSCRIPTION_MESSAGECOUNTER_PREFIX = "Subscription.";
 
-   private DebugLogger logger = new DebugLogger("topic-service.log");
    // Static --------------------------------------------------------
 
    // Attributes ----------------------------------------------------
@@ -71,10 +69,9 @@
          // We deploy any queues corresponding to pre-existing durable subscriptions
 
          Collection queues = po.getQueuesForCondition(new JMSCondition(false, destination.getName()), true);
-         
-         logger.log("queues size: " + queues.size() + " po: " + po.getOfficeName());
       	
          Iterator iter = queues.iterator();
+
          while (iter.hasNext())
          {
             Queue queue = (Queue)iter.next();
@@ -88,20 +85,13 @@
                            + " previous clustered attribute is " + queue.isClustered() 
                            + ". Now re-deploying it with clustered attribute: " + destination.isClustered());
                   
-                  logger.log("Topic " + destination.getName() 
-                           + " previous clustered attribute is " + queue.isClustered() 
-                           + ". Now re-deploying it with clustered attribute: " + destination.isClustered());
-                  logger.log("converting queue: " + queue + " is active: " + queue.isActive());
                   queue = po.convertDestination(destination, queue.getName());
-                  logger.log("converted: " + queue + " is active: " + queue.isActive());
                }
             }
                      
             //TODO We need to set the paging params this way since the post office doesn't store them
             //instead we should never create queues inside the postoffice - only do it at deploy time
             
-            logger.log("starting queue " + queue + " is active: " + queue.isActive());
-            
             if (!queue.isActive())
             {
             

Modified: branches/JBMESSAGING-1742/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/JBMESSAGING-1742/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2009-10-28 16:06:30 UTC (rev 7879)
+++ branches/JBMESSAGING-1742/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2009-10-28 16:28:08 UTC (rev 7880)
@@ -118,8 +118,6 @@
    private static final ExecutorFactory executorFactory = new OrderedExecutorFactory(
            Executors.newCachedThreadPool(new JBMThreadFactory("msg-post-office")));
    //End only used in testing
-   
-   DebugLogger logger = new DebugLogger("post-office.log");
 
    // Static ---------------------------------------------------------------------------------------
 
@@ -470,12 +468,8 @@
    	{
    		throw new IllegalArgumentException("Cannot bind a non clustered queue on all nodes");
    	}
-   	
-      logger.log(thisNodeID + "> add binding: " + binding.queue.getName() + " clustered: " + binding.queue.isClustered() + " allNodes: " + allNodes);
       
    	boolean added = internalAddBinding(binding, allNodes, true);
-
-   	logger.log(thisNodeID + ">binding added: " + binding.queue.getName() + " clustered: " + binding.queue.isClustered() + " allNodes: " + allNodes);
    	
    	if (added && allNodes && clustered && binding.queue.isClustered())
    	{
@@ -1210,8 +1204,6 @@
 	   		queue2.load();
 		   		
 		      queue2.activate();	   		
-		      
-		      logger.log("----queue " + queue2.getName() + " activated in po " + thisNodeID);
    		}
    	}
       
@@ -2082,7 +2074,6 @@
       	if (queue.isRecoverable())
       	{
       		// Need to write the mapping to the database
-      	   logger.log(thisNodeID + "> kkkkkkkk writing binding: " + binding + " cond: " + condition + " queue " + " all " + binding.allNodes, true, null);
       		insertBindingInStorage(condition, queue, binding.allNodes);
       	}
       	
@@ -2774,14 +2765,11 @@
                                                    true, filter, bindingClustered && clustered);
 
                   if (trace) { log.trace(this + " loaded binding from storage: " + queueName); }
-
-                  logger.log(thisNodeID + "> kkkkkk loading a binding with condition: " + conditionText);
                   
                   Condition condition = conditionFactory.createCondition(conditionText);
 
                   Binding binding = new Binding(condition, queue, allNodes);
 
-                  logger.log(thisNodeID + "> binding for queue: " + queueName + " binding: " + binding + " allNodes: " + allNodes);
                   bindings.put(queueName, binding);
                }
 
@@ -2808,8 +2796,6 @@
       while (iter.hasNext())
       {
       	Binding binding = (Binding)iter.next();
-      	
-      	logger.log(thisNodeID + "> loading binding in DB, add: " + binding.queue.getName() + " clustered: " + binding.queue.isClustered());
 
       	addBindingInMemory(binding);