[hornetq-commits] JBoss hornetq SVN: r10241 - in branches/Branch_2_2_EAP/src/main/org/hornetq: core/paging/cursor/impl and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Feb 22 16:40:25 EST 2011
Author: clebert.suconic at jboss.com
Date: 2011-02-22 16:40:25 -0500 (Tue, 22 Feb 2011)
New Revision: 10241
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java
Log:
Removing System.outs
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -1285,7 +1285,7 @@
topologyListeners.add(listener);
if(topology.members() > 0)
{
- System.out.println("ServerLocatorImpl.addClusterTopologyListener");
+ log.debug("ServerLocatorImpl.addClusterTopologyListener");
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -20,6 +20,7 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClusterTopologyListener;
+import org.hornetq.core.logging.Logger;
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
@@ -27,10 +28,16 @@
*/
public class Topology implements Serializable
{
+
/**
*
*/
private static final long serialVersionUID = -9037171688692471371L;
+
+
+
+ private static final Logger log = Logger.getLogger(Topology.class);
+
/*
* topology describes the other cluster nodes that this server knows about:
*
@@ -49,7 +56,7 @@
{
if(member.getConnector().toString().contains("server-id=4"))
{
- System.out.println("member.getConnector() = " + member.getConnector());
+ log.debug("member.getConnector() = " + member.getConnector());
}
}
if(currentMember == null)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -390,14 +390,20 @@
for (PagePosition pos : entry.getValue().acks)
{
- System.out.println("Analizing " + pos);
+ if (isTrace)
+ {
+ trace("Analizing " + pos);
+ }
if (retValue == null || retValue.getMessageNr() > pos.getMessageNr())
{
retValue = pos;
}
}
- System.out.println("Returning initial position " + retValue);
+ if (isTrace)
+ {
+ trace("Returning initial position " + retValue);
+ }
return retValue;
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -145,10 +145,6 @@
storageManager.deleteDuplicateID(id.b);
id.b = null;
}
- else
- {
- System.out.println("Can't delete duplicateID");
- }
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -458,7 +458,7 @@
{
if(!topologyMember.getConnector().a.equals(connector) && !topologyMember.getConnector().a.equals(connectorPair.a))
{
- System.out.println("ClusterConnectionImpl.nodeUP");
+ log.debug("ClusterConnectionImpl.nodeUP");
}
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -609,10 +609,6 @@
public void stop(boolean failoverOnServerShutdown) throws Exception
{
- System.out.println("*** stop called on server");
-
- System.out.flush();
-
synchronized (this)
{
if (!started)
@@ -635,11 +631,6 @@
}
- // we stop the remoting service outside a lock
- if(remotingService == null)
- {
- System.out.println("HornetQServerImpl.stop");
- }
remotingService.stop();
synchronized (this)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -38,6 +38,7 @@
import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.api.jms.management.TopicControl;
import org.hornetq.core.filter.Filter;
+import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.impl.AbstractControl;
import org.hornetq.core.management.impl.MBeanInfoHelper;
import org.hornetq.core.server.ServerConsumer;
@@ -63,6 +64,8 @@
// Constants -----------------------------------------------------
+ private static final Logger log = Logger.getLogger(JMSServerControlImpl.class);
+
// Attributes ----------------------------------------------------
private final JMSServerManager server;
@@ -124,7 +127,7 @@
}
else
{
- System.out.println("JMSServerControlImpl.determineJMSDestination()" + coreAddress);
+ log.debug("JMSServerControlImpl.determineJMSDestination()" + coreAddress);
// not related to JMS
return null;
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -353,7 +353,6 @@
AggregatedSoftReference ref = null;
while ((ref = (AggregatedSoftReference)this.refQueue.poll()) != null)
{
- System.out.println("Removing " + ref.key);
mapDelegate.remove(ref.key);
}
}
More information about the hornetq-commits
mailing list