[jboss-cvs] JBoss Messaging SVN: r6902 - in tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss: jms/client and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 20 01:47:08 EDT 2009
Author: gaohoward
Date: 2009-05-20 01:47:07 -0400 (Wed, 20 May 2009)
New Revision: 6902
Removed:
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/debug/
Modified:
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/FailoverCommandCenter.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnection.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnectionFactory.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageConsumer.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageProducer.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossSession.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/container/ClientConsumer.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/wireformat/RequestSupport.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ClusterRoundRobinDistributor.java
Log:
remove the extra logging
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/FailoverCommandCenter.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/FailoverCommandCenter.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/FailoverCommandCenter.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -9,13 +9,9 @@
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.debug.ClientFailoverTracker;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.logging.Logger;
-import org.jboss.remoting.Client;
import java.util.ArrayList;
import java.util.Iterator;
@@ -75,18 +71,8 @@
JMSRemotingConnection remotingConnection)
throws Exception
{
-
- ClientFailoverTracker tracker = TrackerFactory.getClientFailoverTracker();
log.debug("failure detected by " + source, reason);
- Client theClient = remotingConnection.getRemotingClient();
- String remotingSessionId = theClient == null ? "null" : theClient.getSessionId();
-
- tracker.report("failure detected by " + source + " rmoting " + remotingConnection +
- " client: " + remotingSessionId, reason, true);
- tracker.report("connection, client id: " + state.getClientID() + " server id: " +
- state.getServerID() + "conn id: " + state.getDelegate().getID() +
- " conn remoting " + ((ClientConnectionDelegate)state.getDelegate()).getRemotingConnection(), null, false);
// generate a FAILURE_DETECTED event
broadcastFailoverEvent(new FailoverEvent(FailoverEvent.FAILURE_DETECTED, source));
@@ -118,16 +104,12 @@
failoverSuccessful = true;
failoverEvent = FailoverEvent.FAILOVER_ALREADY_COMPLETED;
-
- tracker.report("somebody already done failover", null, false);
+
//Return true since failover already completed ok
return true;
}
- tracker.report("setting remoting connection failed. remoting session id: " +
- remotingSessionId, null, false);
remotingConnection.setFailed();
- tracker.report("done set failed.", null, false);
}
// Note - failover doesn't occur until _after_ the above check - so the next comment
@@ -159,15 +141,10 @@
// recursively synchronize state
ClientConnectionDelegate newDelegate = (ClientConnectionDelegate)res.getDelegate();
- tracker.report("new conn Delegate got: " + newDelegate.getID() + " clientID: (cannot call it)" +
- " server ID: " + newDelegate.getServerID(), null, false);
-
log.trace("Synchronizing state");
state.getDelegate().synchronizeWith(newDelegate);
log.trace("Synchronized state");
- tracker.report("state synchronized", null, false);
-
//Now restart the connection if appropriate
//Note! we mus start the connection while the valve is still closed
//Otherwise If a consumer closing is waiting on failover to complete
@@ -180,9 +157,7 @@
if (state.isStarted())
{
log.trace("Starting new connection");
- tracker.report("restart the new connection" , null, false);
newDelegate.startAfterFailover();
- tracker.report("restarted" , null, false);
log.trace("Started new connection");
}
@@ -190,12 +165,10 @@
remotingConnection.getConnectionListener().getJMSExceptionListener() != null)
{
log.trace("Adding Exception Listener to new connection");
- tracker.report("setting exception listener on new delegate: " + newDelegate.getID(), null, false);
newDelegate.setExceptionListener(remotingConnection.getConnectionListener().getJMSExceptionListener());
}
log.trace("Opening valve");
valve.open();
- tracker.report("valve opened", null, false);
log.trace("Opened valve");
valveOpened = true;
@@ -206,14 +179,11 @@
log.trace("failureDetected() complete");
- tracker.report("failover end with: " + failoverSuccessful, null, false);
return failoverSuccessful;
}
catch (Exception e)
{
log.error("Failover failed", e);
-
- tracker.report("failover failed." , e, false);
throw e;
}
finally
@@ -222,7 +192,6 @@
{
log.trace("finally opening valve");
valve.open();
- tracker.report("finally valve opened.", null, false);
log.trace("valve opened");
}
@@ -230,16 +199,13 @@
{
log.debug(this + " completed successful failover");
broadcastFailoverEvent(new FailoverEvent(failoverEvent, this));
- tracker.report("finally failover ok", null, false);
}
else
{
log.debug(this + " aborted failover");
- tracker.report("finally abort failover", null, false);
ClientConnectionDelegate connDelegate = (ClientConnectionDelegate)state.getDelegate();
connDelegate.closing(-1);
connDelegate.close();
- tracker.report("aborted conn: " + connDelegate.getID(), null, false);
broadcastFailoverEvent(new FailoverEvent(FailoverEvent.FAILOVER_FAILED, this));
}
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnection.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnection.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnection.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -45,11 +45,8 @@
import javax.jms.XATopicSession;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
-import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.delegate.SessionDelegate;
@@ -133,11 +130,6 @@
{
delegate.closing(-1);
delegate.close();
-
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
-
- tracker.connectionEvent(((ClientConnectionDelegate)delegate).getID(), null, "closed.", false);
- tracker.removeConnection(((ClientConnectionDelegate)delegate).getID());
}
public ConnectionConsumer createConnectionConsumer(Destination destination,
@@ -276,11 +268,7 @@
SessionDelegate sessionDelegate =
delegate.createSessionDelegate(transacted, acknowledgeMode, isXA);
-
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
- tracker.sessionEvent(((ClientSessionDelegate)sessionDelegate).getID(), null, " created. isXA: " + isXA + " type: " + type, true);
-
return new JBossSession(sessionDelegate, type);
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnectionFactory.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnectionFactory.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossConnectionFactory.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -39,8 +39,6 @@
import javax.naming.NamingException;
import javax.naming.Reference;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.jms.referenceable.SerializableObjectRefAddr;
@@ -207,10 +205,6 @@
CreateConnectionResult res = delegate.createConnectionDelegate(username, password, -1);
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
-
- tracker.connectionEvent(res.getDelegate().getID(), null, "created. user: " + username + " isXA: " + isXA + " type: " + type, true);
-
return new JBossConnection(res.getDelegate(), type);
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageConsumer.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageConsumer.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageConsumer.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -32,9 +32,6 @@
import javax.jms.Topic;
import javax.jms.TopicSubscriber;
-import org.jboss.jms.client.delegate.ClientConsumerDelegate;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConsumerDelegate;
/**
@@ -96,14 +93,8 @@
public void close() throws JMSException
{
-
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
-
- tracker.consumerEvent(((ClientConsumerDelegate)delegate).getID(), null, "closing.", false);
delegate.closing(-1);
delegate.close();
- tracker.consumerEvent(((ClientConsumerDelegate)delegate).getID(), null, "closed.", false);
- tracker.removeConsumer(((ClientConsumerDelegate)delegate).getID());
}
// QueueReceiver implementation ----------------------------------
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageProducer.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageProducer.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossMessageProducer.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -33,14 +33,8 @@
import javax.jms.Topic;
import javax.jms.TopicPublisher;
-import org.jboss.jms.client.delegate.ClientProducerDelegate;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.MessageTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ProducerDelegate;
import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.message.JBossMessage;
-import org.jboss.jms.message.MessageProxy;
import org.jboss.logging.Logger;
/**
@@ -134,9 +128,6 @@
{
delegate.closing(-1);
delegate.close();
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
- tracker.producerEvent(((ClientProducerDelegate)delegate).getID(), null, "closed", false);
- tracker.removeProducer(((ClientProducerDelegate)delegate).getID());
}
public void send(Message message) throws JMSException
@@ -171,17 +162,6 @@
}
delegate.send((JBossDestination)destination, m, deliveryMode, priority, timeToLive);
-
- //some tests pass foreign messages, so check it
- MessageTracker mTracker = TrackerFactory.getClientMessageTracker();
- if (m instanceof MessageProxy)
- {
- mTracker.messageEvent("" + ((MessageProxy)m).getMessage().getMessageID(), "message sent. " + ((ClientProducerDelegate)delegate).getID(), false);
- }
- else
- {
- mTracker.messageEvent("" + m.getJMSMessageID(), "alien message sent. " + ((ClientProducerDelegate)delegate).getID(), false);
- }
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossSession.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossSession.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/JBossSession.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -53,13 +53,8 @@
import javax.jms.XATopicSession;
import javax.transaction.xa.XAResource;
-import org.jboss.jms.client.delegate.ClientConsumerDelegate;
-import org.jboss.jms.client.delegate.ClientProducerDelegate;
-import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.SessionState;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.BrowserDelegate;
import org.jboss.jms.delegate.ConsumerDelegate;
import org.jboss.jms.delegate.ProducerDelegate;
@@ -176,13 +171,8 @@
public void close() throws JMSException
{
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
- tracker.sessionEvent(((ClientSessionDelegate)delegate).getID(), null, " closing. ", false);
delegate.closing(-1);
- tracker.sessionEvent(((ClientSessionDelegate)delegate).getID(), null, " closing done. ", false);
delegate.close();
- tracker.sessionEvent(((ClientSessionDelegate)delegate).getID(), null, " closed. ", false);
- tracker.removeSession(((ClientSessionDelegate)delegate).getID());
}
public void recover() throws JMSException
@@ -217,9 +207,6 @@
}
ProducerDelegate producerDelegate = delegate.createProducerDelegate((JBossDestination)d);
-
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
- tracker.producerEvent(((ClientProducerDelegate)producerDelegate).getID(), null, "producer created. sess: " + ((ClientSessionDelegate)delegate).getID(), true);
return new JBossMessageProducer(producerDelegate);
}
@@ -251,8 +238,6 @@
ConsumerDelegate cd = delegate.
createConsumerDelegate((JBossDestination)d, messageSelector, noLocal, null, false, true);
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
- tracker.consumerEvent(((ClientConsumerDelegate)cd).getID(), null, "created. ", true);
return new JBossMessageConsumer(cd);
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/container/ClientConsumer.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/container/ClientConsumer.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -30,8 +30,6 @@
import javax.jms.MessageListener;
import javax.jms.Session;
-import org.jboss.jms.debug.MessageTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.Cancel;
import org.jboss.jms.delegate.ConsumerDelegate;
import org.jboss.jms.delegate.DefaultCancel;
@@ -923,9 +921,6 @@
//Add it to the buffer
buffer.addLast(proxy, proxy.getJMSPriority());
-
- MessageTracker mTracker = TrackerFactory.getClientMessageTracker();
- mTracker.messageEvent("" + proxy.getMessage().getMessageID(), "message arrives at client", false);
lastDeliveryId = proxy.getDeliveryId();
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -35,8 +35,6 @@
import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.client.state.HierarchicalState;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.delegate.IDBlock;
import org.jboss.jms.delegate.SessionDelegate;
@@ -162,9 +160,6 @@
long result = ((Long)doInvoke(client, req)).longValue();
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
- tracker.connectionEvent(getID(), null, "Closing returned from server. " + result, false);
-
return result;
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -32,8 +32,6 @@
import org.jboss.jms.client.container.JMSClientVMIdentifier;
import org.jboss.jms.client.remoting.ConsolidatedRemotingConnectionListener;
import org.jboss.jms.client.remoting.JMSRemotingConnection;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.jms.delegate.TopologyResult;
@@ -197,12 +195,6 @@
connectionDelegate.setRemotingConnection(remotingConnection);
connectionDelegate.setVersionToUse(version);
-
- JMSObjectTracker tracker = TrackerFactory.getClientJMSObjTracker();
-
- tracker.connectionEvent(connectionDelegate.getID(), null, "conn delegate created: " +
- "remoting id: " + remotingConnection.getRemotingClient().getSessionId() +
- "clientVmId: " + JMSClientVMIdentifier.instance, false);
}
else
{
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -22,13 +22,10 @@
package org.jboss.jms.client.remoting;
import java.security.AccessController;
-import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.jms.debug.ClientFailoverTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.wireformat.JMSWireFormat;
import org.jboss.logging.Logger;
@@ -362,8 +359,6 @@
{
log.trace(this + " stop");
- ClientFailoverTracker tracker = TrackerFactory.getClientFailoverTracker();
-
// explicitly remove the callback listener, to avoid race conditions on server
// (http://jira.jboss.org/jira/browse/JBMESSAGING-535)
@@ -373,7 +368,6 @@
}
catch(Throwable ignore)
{
- tracker.report("failed removing callback listeer" + client.getSessionId(), ignore, false);
// very unlikely to get an exception on a local remove (I suspect badly designed API),
// but we're failed anyway, so we don't care too much
@@ -386,30 +380,25 @@
try
{
- tracker.report("Disconnecting client " + client.getSessionId(), null, false);
- client.disconnect();
+ client.disconnect();
}
catch (Throwable ignore)
- {
- tracker.report("failed to disconnect."+ client.getSessionId(), ignore, false);
- log.trace(this + " failed to disconnect the client", ignore);
+ {
+ log.trace(this + " failed to disconnect the client", ignore);
}
try
{
- tracker.report("Disconnecting oneway client: " + onewayClient.getSessionId(), null, false);
- onewayClient.disconnect();
+ onewayClient.disconnect();
}
catch (Throwable ignore)
{
- tracker.report("failed to disconnect onway" + onewayClient.getSessionId(), ignore, false);
log.trace(this + " failed to disconnect the client", ignore);
}
client = null;
onewayClient = null;
- tracker.report("remoting client closed", null, false);
log.trace(this + " closed");
}
@@ -444,15 +433,10 @@
*/
public synchronized void setFailed()
{
-
- ClientFailoverTracker tracker = TrackerFactory.getClientFailoverTracker();
- tracker.report("call setFail on : " + this, null, false);
-
failed = true;
if (client == null)
{
- tracker.report("client already null " + this, null, false);
return;
}
@@ -463,31 +447,23 @@
try
{
- tracker.report("setFailed, set 0 timeout on client: " + client.getSessionId(), null, false);
- client.setDisconnectTimeout(0);
- tracker.report("done set 0 timeout", null, false);
+ client.setDisconnectTimeout(0);
}
catch (Throwable ignore)
- {
- tracker.report("error setting 0 timeout on client " + client.getSessionId(), ignore, false);
- log.trace(this + " failed to set disconnect timeout", ignore);
+ {
+ log.trace(this + " failed to set disconnect timeout", ignore);
}
try
{
- tracker.report("setFailed, set 0 timeout oneway client: " + onewayClient.getSessionId(), null, false);
onewayClient.setDisconnectTimeout(0);
- tracker.report("done set 0 timeout oneway", null, false);
}
catch (Throwable ignore)
{
- tracker.report("error setting 0 timeout on oneway client", ignore, false);
log.trace(this + " failed to set disconnect timeout", ignore);
}
- tracker.report(" stopping " + this, null, false);
stop();
- tracker.report(" stopped " + this, null, false);
}
/**
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -29,10 +29,6 @@
import java.util.Map;
import java.util.Set;
-import javax.jms.JMSException;
-
-import org.jboss.jms.debug.ServerFailoverTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.server.ConnectionManager;
import org.jboss.jms.server.endpoint.ServerConnectionEndpoint;
@@ -118,14 +114,6 @@
activeConnectionEndpoints.add(endpoint);
- ServerFailoverTracker tracker = TrackerFactory.getServerFailoverTracker();
- if (endpoint instanceof ServerConnectionEndpoint)
- {
- tracker.report("register conn: " + ((ServerConnectionEndpoint)endpoint).getId() +
- "clientVM id: " + jmsClientVMID +
- "remoting id: " + remotingClientSessionID, null, false);
- }
-
log.debug("registered connection " + endpoint + " as " +
Util.guidToString(remotingClientSessionID));
}
@@ -157,21 +145,12 @@
Map<String, ConnectionEndpoint> endpoints = this.jmsClients.get(jmsClientVMId);
- ServerFailoverTracker tracker = TrackerFactory.getServerFailoverTracker();
-
- tracker.report("unregistering connection, clientVM: " + jmsClientVMId +
- "remoting ID: " + remotingClientSessionID, null, false);
-
if (endpoints != null)
{
ConnectionEndpoint e = endpoints.remove(remotingClientSessionID);
if (e != null)
{
-
- tracker.report("endpint found: " + e +
- "remoting ID: " + remotingClientSessionID +
- "clientVM: " + jmsClientVMId, null, false);
activeConnectionEndpoints.remove(e);
}
@@ -180,18 +159,14 @@
if (endpoints.isEmpty())
{
- tracker.report("no more ednpoints for client: " + jmsClientVMId, null, false);
jmsClients.remove(jmsClientVMId);
}
remotingSessions.remove(remotingClientSessionID);
- tracker.report("endpoint removed: " + e, null, false);
return e;
}
-
- tracker.report("no endpoint to remove for " + jmsClientVMId +
- " remoting session: " + remotingClientSessionID, null, false);
+
return null;
}
@@ -244,16 +219,14 @@
*/
public void handleConnectionException(Throwable t, Client client)
{
- ServerFailoverTracker tracker = TrackerFactory.getServerFailoverTracker();
-
- if (t instanceof ClientDisconnectedException)
- {
- tracker.report("normal disconnection" + client.getSessionId(), t, false);
- }
- else
- {
- tracker.report("server failure detected for client: " + client.getSessionId(), t, true);
- }
+ if (t instanceof ClientDisconnectedException)
+ {
+ if (trace) { log.trace("normal disconnection for client: " + client.getSessionId()); }
+ }
+ else
+ {
+ if (trace) { log.trace("server failure detected for client: " + client.getSessionId()); }
+ }
String remotingSessionID = client.getSessionId();
@@ -261,7 +234,6 @@
{
handleClientFailure(remotingSessionID);
}
- tracker.report("handle complete for client: " + remotingSessionID, t, false);
}
// ClusterNotificationListener implementation ---------------------------------------------------
@@ -445,21 +417,18 @@
private void cleanupForSessionID(String jmsSessionID)
{
- String jmsClientID = remotingSessions.get(jmsSessionID);
+ String jmsClientID = remotingSessions.get(jmsSessionID);
-// log.warn("A problem has been detected " +
-// "with the connection to remote client " +
-// jmsSessionID + ", jmsClientID=" + jmsClientID + ". It is possible the client has exited without closing " +
-// "its connection(s) or the network has failed. All associated connection resources will be cleaned up.");
-
- ServerFailoverTracker tracker = TrackerFactory.getServerFailoverTracker();
-
- tracker.report("clean up for clientVM: " + jmsClientID +
- " on remoting client: " + jmsSessionID, null, false);
+ if (trace)
+ {
+ log.trace("A problem has been detected " +
+ "with the connection to remote client " +
+ jmsSessionID + ", jmsClientID=" + jmsClientID + ". It is possible the client has exited without closing " +
+ "its connection(s) or the network has failed. All associated connection resources will be cleaned up.");
+ }
- if (jmsClientID != null)
- {
- tracker.report("We have client: " + jmsClientID, null, false);
+ if (jmsClientID != null)
+ {
Map<String, ConnectionEndpoint> endpoints = jmsClients.get(jmsClientID);
if (endpoints != null)
@@ -481,7 +450,6 @@
// sce could also be a mock test.. so this test is required
if (conn instanceof ServerConnectionEndpoint)
{
- tracker.report("we close callback: " + ((ServerConnectionEndpoint)conn).getId(), null, false);
//Remoting is dumb and doesn't clean up it's state after itself - so we have to do it.
((ServerConnectionEndpoint)conn).closeCallbackClient();
@@ -489,29 +457,22 @@
try
{
- tracker.report("cleanup closing conn: " + conn.toString(), null, false);
- conn.closing(-1);
+ conn.closing(-1);
}
catch (Throwable ignore)
{
- tracker.report("error cleanup closing conn: " + conn.toString(), ignore, false);
}
try
{
- tracker.report("cleanup close conn: " + conn.toString(), null, false);
- conn.close();
+ conn.close();
}
catch (Throwable ignore)
- {
- tracker.report("error cleanup close conn: " + conn.toString(), ignore, false);
+ {
}
- tracker.report("returning after cleanup conn" + conn.toString(), null, false);
return;
}
}
- }
- tracker.report("getting handlers info: " + jmsClientID +
- " and remote sessid: " + jmsSessionID, null, false);
+ }
Map<String, InvokerCallbackHandler> handlers = cfHandlers.get(jmsClientID);
@@ -525,29 +486,23 @@
{
try
{
- tracker.report("disconnection callback client for " + jmsSessionID, null, false);
((ServerInvokerCallbackHandler)entry.getValue()).getCallbackClient().disconnect();
}
catch (Throwable ignore)
{
- tracker.report("error disconn cb for " + jmsSessionID, ignore, false);
}
try
{
- tracker.report("try destroy cb for " + jmsSessionID, null, false);
((ServerInvokerCallbackHandler)entry.getValue()).shutdown();
}
catch (Throwable ignore)
{
- tracker.report("error destroying cb for " + jmsSessionID, ignore, false);
}
for (ServerConnectionFactoryEndpoint ep: connectionFactories)
{
- tracker.report("remove facotyr cb for: " + jmsSessionID +
- " ep: " + ep, null, false);
- ep.removeCallbackhandler(entry.getValue());
+ ep.removeCallbackhandler(entry.getValue());
}
found = true;
@@ -558,14 +513,9 @@
if (found)
{
- tracker.report("unregister cf cb: " + jmsClientID +
- " jmsSessionID: " + jmsSessionID, null, false);
- unregisterConnectionFactoryCallback(jmsClientID, jmsSessionID);
+ unregisterConnectionFactoryCallback(jmsClientID, jmsSessionID);
}
}
- tracker.report("done clean cb " + jmsClientID +
- " jmsSessionID: " + jmsSessionID, null, false);
-
}
// Inner classes --------------------------------------------------------------------------------
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -39,8 +39,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.remoting.CallbackManager;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.delegate.IDBlock;
import org.jboss.jms.delegate.SessionDelegate;
@@ -279,10 +277,6 @@
ClientSessionDelegate d = new ClientSessionDelegate(sessionID, dupsOKBatchSize);
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
-
- tracker.sessionEvent(sessionID, null, "server session created. conntion: " + this.id, true);
-
log.trace("created " + d);
return d;
@@ -374,7 +368,6 @@
public void close() throws JMSException
{
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
try
{
synchronized (this)
@@ -383,7 +376,6 @@
if (closed)
{
- tracker.connectionEvent(id, null, "already closed", false);
log.warn("Connection is already closed");
return;
}
@@ -460,13 +452,9 @@
cm.unregisterConnection(jmsClientVMID, remotingClientSessionID);
Dispatcher.instance.unregisterTarget(id, this);
-
- tracker.connectionEvent(id, null, "server connection closed.", false);
- tracker.removeConnection(id);
}
catch (Throwable t)
{
- tracker.connectionEvent(id, null, "server conn closing error " + t, false);
throw ExceptionUtil.handleJMSInvocation(t, this + " close");
}
}
@@ -482,7 +470,7 @@
{
try
{
- callbackHandler.getCallbackClient().disconnect();
+ callbackHandler.shutdown();
}
catch (Throwable t)
{
@@ -496,7 +484,6 @@
public void sendTransaction(TransactionRequest request,
boolean checkForDuplicates) throws JMSException
{
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
try
{
if (closed)
@@ -510,9 +497,7 @@
Transaction tx = tr.createTransaction();
processTransaction(request.getState(), tx, checkForDuplicates);
- tracker.connectionEvent(id, null, "1pc tx " + tx.getId(), false);
tx.commit();
- tracker.connectionEvent(id, null, "1pc tx done. " + tx.getId(), false);
}
else if (request.getRequestType() == TransactionRequest.TWO_PHASE_PREPARE_REQUEST)
{
@@ -548,7 +533,6 @@
}
catch (Throwable t)
{
- tracker.connectionEvent(id, null, "ex sending tx " + t, false);
throw ExceptionUtil.handleJMSInvocation(t, this + " sendTransaction");
}
}
@@ -714,8 +698,6 @@
boolean sendMessage(JBossMessage msg, Transaction tx, boolean checkForDuplicates) throws Exception
{
-
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
JBossDestination dest = (JBossDestination)msg.getJMSDestination();
if (!dest.isDirect())
@@ -783,10 +765,8 @@
else if (dest.isQueue())
{
if (trace) { log.trace(this + " routing " + msg + " to queue"); }
- tracker.connectionEvent(id, null, "routing message : " + ref.getMessage().getMessageID(), false);
- if (!postOffice.route(ref, new JMSCondition(true, dest.getName()), tx))
+ if (!postOffice.route(ref, new JMSCondition(true, dest.getName()), tx))
{
- tracker.connectionEvent(id, null, "fail to route msg: " + ref.getMessage().getMessageID() + " with tx: " + tx, false);
throw new JMSException("Failed to route " + ref + " to " + dest.getName());
}
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -21,7 +21,6 @@
*/
package org.jboss.jms.server.endpoint;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -30,8 +29,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.jms.delegate.TopologyResult;
@@ -161,8 +158,6 @@
ServerInvokerCallbackHandler callbackHandler)
throws JMSException
{
-
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
try
{
if (failedNodeID == -1)
@@ -173,7 +168,6 @@
remotingSessionID, clientVMID,
versionToUse,
callbackHandler);
- tracker.connectionEvent(cd.getID(), null, "created standard. ", true);
return new CreateConnectionResult(cd);
}
@@ -199,7 +193,6 @@
remotingSessionID, clientVMID,
versionToUse,
callbackHandler);
- tracker.connectionEvent(cd.getID(), null, "created failover. ", true);
return new CreateConnectionResult(cd);
}
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -25,8 +25,6 @@
import javax.jms.InvalidSelectorException;
import javax.jms.JMSException;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.ConsumerEndpoint;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.jms.message.JBossMessage;
@@ -380,9 +378,6 @@
public void close() throws JMSException
{
-
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
- tracker.consumerEvent(this.id, null, "close()", false);
try
{
if (trace)
@@ -521,8 +516,6 @@
void localClose() throws Throwable
{
-
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
if (trace) { log.trace(this + " grabbed the main lock in close() " + this); }
if (remote)
@@ -579,8 +572,6 @@
}
}
}
- tracker.consumerEvent(id, null, "closed.", false);
- tracker.removeConsumer(id);
}
void start()
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -40,9 +40,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientBrowserDelegate;
import org.jboss.jms.client.delegate.ClientConsumerDelegate;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.MessageTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.delegate.Ack;
import org.jboss.jms.delegate.BrowserDelegate;
import org.jboss.jms.delegate.Cancel;
@@ -328,9 +325,6 @@
public void close() throws JMSException
{
-
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
- tracker.sessionEvent(this.id, null, "close()", false);
try
{
localClose();
@@ -1135,11 +1129,6 @@
void localClose() throws Throwable
{
-
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
- tracker.sessionEvent(id, null, "localClose()", false);
-
if (closed)
{
//don't throw the exception as it maybe called twice
@@ -1185,11 +1174,10 @@
synchronized (deliveries)
{
- tracker.sessionEvent(id, null, "sync deliveries.", false);
- List entries = new ArrayList(deliveries.entrySet());
+ List entries = new ArrayList(deliveries.entrySet());
- //Sort them in reverse delivery id order
- Collections.sort(entries,
+ //Sort them in reverse delivery id order
+ Collections.sort(entries,
new Comparator()
{
public int compare(Object obj1, Object obj2)
@@ -1202,39 +1190,38 @@
}
});
- Iterator iter = entries.iterator();
+ Iterator iter = entries.iterator();
- Set channels = new HashSet();
+ Set channels = new HashSet();
- if (trace) { log.trace(this + " cancelling " + entries.size() + " deliveries"); }
+ if (trace) { log.trace(this + " cancelling " + entries.size() + " deliveries"); }
- while (iter.hasNext())
- {
- Map.Entry entry = (Map.Entry)iter.next();
+ while (iter.hasNext())
+ {
+ Map.Entry entry = (Map.Entry)iter.next();
- if (trace) { log.trace(this + " cancelling delivery with delivery id: " + entry.getKey()); }
+ if (trace) { log.trace(this + " cancelling delivery with delivery id: " + entry.getKey()); }
+
+ DeliveryRecord rec = (DeliveryRecord)entry.getValue();
- DeliveryRecord rec = (DeliveryRecord)entry.getValue();
+ rec.del.cancel();
- rec.del.cancel();
+ channels.add(rec.del.getObserver());
+ }
- mTracker.messageEvent("" + rec.del.getReference().getMessage().getMessageID(), " msg canceled", false);
- channels.add(rec.del.getObserver());
- }
+ promptDelivery(channels);
- promptDelivery(channels);
+ //Close down the executor
- //Close down the executor
+ //Note we need to wait for ALL tasks to complete NOT just one otherwise we can end up with the following situation
+ //prompter is queued and starts to execute
+ //prompter almost finishes executing then a message is cancelled due to this session closing
+ //this causes another prompter to be queued
+ //shutdownAfterProcessingCurrentTask is then called
+ //this means the second prompter never runs and the cancelled message doesn't get redelivered
+ executor.shutdownAfterProcessingCurrentlyQueuedTasks();
- //Note we need to wait for ALL tasks to complete NOT just one otherwise we can end up with the following situation
- //prompter is queued and starts to execute
- //prompter almost finishes executing then a message is cancelled due to this session closing
- //this causes another prompter to be queued
- //shutdownAfterProcessingCurrentTask is then called
- //this means the second prompter never runs and the cancelled message doesn't get redelivered
- executor.shutdownAfterProcessingCurrentlyQueuedTasks();
-
- deliveries.clear();
+ deliveries.clear();
}
sp.removeSession(id);
@@ -1242,9 +1229,6 @@
Dispatcher.instance.unregisterTarget(id, this);
closed = true;
-
- tracker.sessionEvent(id, null, "locally closed", false);
- tracker.removeSession(id);
}
void cancelDelivery(long deliveryId) throws Throwable
@@ -1438,14 +1422,12 @@
void performDelivery(MessageReference ref, long deliveryID, ServerConsumerEndpoint consumer)
{
-
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
- if (consumer == null)
- {
- if (trace) { log.trace(this + " consumer is null, cannot perform delivery"); }
+ if (consumer == null)
+ {
+ if (trace) { log.trace(this + " consumer is null, cannot perform delivery"); }
- return;
- }
+ return;
+ }
if (consumer.isDead())
{
@@ -1466,13 +1448,9 @@
{
// one way invocation, no acknowledgment sent back by the client
if (trace) { log.trace(this + " submitting message " + ref.getMessage() + " to the remoting layer to be sent asynchronously"); }
-
- mTracker.messageEvent("" + ref.getMessage().getMessageID(), "deliver msg to consumer: " + consumer.getID() + " from session: " + this.id, false);
callbackHandler.handleCallbackOneway(callback);
- mTracker.messageEvent("" + ref.getMessage().getMessageID(), "sent to remoting layer ", false);
-
//We store the delivery id so we know to wait for any deliveries in transit on close
consumer.setLastDeliveryID(deliveryID);
}
@@ -1753,8 +1731,6 @@
private boolean acknowledgeDeliveryInternal(Ack ack) throws Throwable
{
-
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
if (trace) { log.trace(this + " acknowledging delivery " + ack); }
DeliveryRecord rec = null;
@@ -1778,8 +1754,6 @@
log.debug("Cannot find " + ack + " to acknowledge, it was probably acknowledged before");
return false;
}
-
- mTracker.messageEvent(rec.del.getReference().getMessage().getMessageID()+"", "acking from session: " + id, false);
ServerConsumerEndpoint consumer = rec.getConsumer();
@@ -2184,10 +2158,6 @@
}
log.trace(this + " created and registered " + ep);
-
- JMSObjectTracker tracker = TrackerFactory.getServerJMSObjTracker();
-
- tracker.consumerEvent(consumerID, null, "created. session: " + id, true);
return stub;
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/wireformat/RequestSupport.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/wireformat/RequestSupport.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/jms/wireformat/RequestSupport.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -24,8 +24,6 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
-import org.jboss.jms.debug.JMSObjectTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.server.ServerPeer;
import org.jboss.remoting.InvocationRequest;
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ChannelSupport.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ChannelSupport.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -28,8 +28,6 @@
import java.util.ListIterator;
import java.util.Set;
-import org.jboss.jms.debug.MessageTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.jms.server.MessagingTimeoutFactory;
import org.jboss.logging.Logger;
import org.jboss.messaging.core.contract.Channel;
@@ -188,7 +186,6 @@
public Delivery handle(DeliveryObserver sender, MessageReference ref, Transaction tx)
{
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
if (!isActive())
{
if (trace) { log.trace(this + " is not active, returning null delivery for " + ref); }
@@ -217,7 +214,6 @@
// Each channel has its own copy of the reference
ref = ref.copy();
- mTracker.messageEvent("" + ref.getMessage().getMessageID(), "in queue " + this.getChannelID());
try
{
if (tx == null)
@@ -245,8 +241,6 @@
}
else
{
- mTracker.messageEvent("" + ref.getMessage().getMessageID(), "to tx: " + tx.getId(), false);
-
if (trace) { log.trace(this + " adding " + ref + " to state " + (tx == null ? "non-transactionally" : "in transaction: " + tx)); }
// add to post commit callback
@@ -291,7 +285,6 @@
public void cancel(Delivery del) throws Throwable
{
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
//We may need to update the delivery count in the database
MessageReference ref = del.getReference();
@@ -303,8 +296,7 @@
if (!del.isRecovered())
{
- mTracker.messageEvent("" + del.getReference().getMessage().getMessageID(), "cancel msg and dec count: " + deliveringCount.get(), false);
- deliveringCount.decrement();
+ deliveringCount.decrement();
}
if (!checkAndSchedule(ref))
@@ -464,13 +456,10 @@
*/
public int getMessageCount()
{
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
- synchronized (lock)
+ synchronized (lock)
{
- if (trace) { log.trace("Getting message count mr: "+ messageRefs.size() + " dc " + getDeliveringCount() + " sc " + getScheduledCount()); }
+ if (trace) { log.trace("Getting message count mr: "+ messageRefs.size() + " dc " + getDeliveringCount() + " sc " + getScheduledCount()); }
- mTracker.messageEvent("nullidgetmsgcount: ", " refs: " + messageRefs.size() + " dels: " +
- getDeliveringCount() + " schds: " + getScheduledCount(), false);
return messageRefs.size() + getDeliveringCount() + getScheduledCount();
}
}
@@ -749,11 +738,8 @@
protected void acknowledgeInternal(Delivery d, Transaction tx, boolean persist) throws Exception
{
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
-
if (tx == null)
{
- mTracker.messageEvent("" + d.getReference().getMessage().getMessageID(), "acknowledging non-tx", false);
if (persist && recoverable && d.getReference().getMessage().isReliable())
{
pm.removeReference(channelID, d.getReference(), null);
@@ -761,15 +747,11 @@
if (!d.isRecovered())
{
- mTracker.messageEvent("" + d.getReference().getMessage().getMessageID(), " decrease count", false);
deliveringCount.decrement();
- mTracker.messageEvent("" + d.getReference().getMessage().getMessageID(), "msg finished with count: " + deliveringCount.get(), false);
- mTracker.removeMessage("" + d.getReference().getMessage().getMessageID());
}
}
else
{
- mTracker.messageEvent("" + d.getReference().getMessage().getMessageID(), "acknowledging tx", false);
this.getCallback(tx).addDelivery(d);
if (trace) { log.trace(this + " added " + d + " to memory on transaction " + tx); }
@@ -896,7 +878,6 @@
public void afterCommit(boolean onePhase) throws Exception
{
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
try
{
// We add the references to the state (or schedule them if appropriate)
@@ -942,9 +923,7 @@
if (!del.isRecovered())
{
- mTracker.messageEvent("" + del.getReference().getMessage().getMessageID(), "decrease count in tx commit", false);
- deliveringCount.decrement();
- mTracker.removeMessage("" + del.getReference().getMessage().getMessageID());
+ deliveringCount.decrement();
}
}
Modified: tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ClusterRoundRobinDistributor.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ClusterRoundRobinDistributor.java 2009-05-20 00:35:48 UTC (rev 6901)
+++ tags/JBossMessaging_1_4_0_SP3_CP03_1456/src/main/org/jboss/messaging/core/impl/ClusterRoundRobinDistributor.java 2009-05-20 05:47:07 UTC (rev 6902)
@@ -23,8 +23,6 @@
import java.util.Iterator;
-import org.jboss.jms.debug.MessageTracker;
-import org.jboss.jms.debug.TrackerFactory;
import org.jboss.logging.Logger;
import org.jboss.messaging.core.contract.Delivery;
import org.jboss.messaging.core.contract.DeliveryObserver;
@@ -74,35 +72,31 @@
public Delivery handle(DeliveryObserver observer, MessageReference ref, Transaction tx)
{
-
- MessageTracker mTracker = TrackerFactory.getServerMessageTracker();
//First try the local distributor
- if (trace) { log.trace(this + " first trying with local distributor"); }
+ if (trace) { log.trace(this + " first trying with local distributor"); }
- mTracker.messageEvent("" + ref.getMessage().getMessageID(), "1st to local", false);
- Delivery del = localDistributor.handle(observer, ref, tx);
+ Delivery del = localDistributor.handle(observer, ref, tx);
- if (trace) { log.trace(this + " local distributor returned " + del); }
+ if (trace) { log.trace(this + " local distributor returned " + del); }
- if (del == null)
- {
- //If no local distributor takes the ref then we try the remote distributor
-
- if (trace) { log.trace(this + " trying with remote distributor"); }
-
- mTracker.messageEvent("" + ref.getMessage().getMessageID(), "next to remote", false);
- del = remoteDistributor.handle(observer, ref, tx);
-
- if (trace) { log.trace(this + " remote distributor returned " + del); }
- }
+ if (del == null)
+ {
+ //If no local distributor takes the ref then we try the remote distributor
- return del;
+ if (trace) { log.trace(this + " trying with remote distributor"); }
+
+ del = remoteDistributor.handle(observer, ref, tx);
+
+ if (trace) { log.trace(this + " remote distributor returned " + del); }
+ }
+
+ return del;
}
public boolean add(Receiver r)
{
- //FIXME - get the absraction right so this is not necessary
+ //FIXME - get the absraction right so this is not necessary
throw new IllegalStateException("Not used!");
}
More information about the jboss-cvs-commits
mailing list