[Jboss-cvs] JBoss Messaging SVN: r1253 - in trunk: src/main/org/jboss/messaging/core src/main/org/jboss/messaging/core/plugin src/main/org/jboss/messaging/core/plugin/exchange src/main/org/jboss/messaging/core/refqueue tests/src/org/jboss/test/messaging/core/local tests/src/org/jboss/test/messaging/core/paging tests/src/org/jboss/test/messaging/core/plugin tests/src/org/jboss/test/messaging/core/plugin/base
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 1 18:18:03 EDT 2006
Author: timfox
Date: 2006-09-01 18:17:53 -0400 (Fri, 01 Sep 2006)
New Revision: 1253
Modified:
trunk/src/main/org/jboss/messaging/core/PagingChannel.java
trunk/src/main/org/jboss/messaging/core/plugin/JDBCServiceSupport.java
trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredExchangeSupport.java
trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredTopicExchange.java
trunk/src/main/org/jboss/messaging/core/plugin/exchange/ExchangeSupport.java
trunk/src/main/org/jboss/messaging/core/plugin/exchange/TopicExchange.java
trunk/src/main/org/jboss/messaging/core/refqueue/PrioritizedDequeIterator.java
trunk/tests/src/org/jboss/test/messaging/core/local/RoundRobinPointToPointRouterTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredTopicExchangeTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/DirectExchangeTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/base/ExchangeTestBase.java
Log:
Removed extraneous log statements
Modified: trunk/src/main/org/jboss/messaging/core/PagingChannel.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/PagingChannel.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/src/main/org/jboss/messaging/core/PagingChannel.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -195,8 +195,6 @@
{
if (trace) { log.trace(this + " cancelling " + del + " in memory"); }
- log.info(this + " cancelling " + del + " in memory");
-
boolean removed;
synchronized (deliveryLock)
@@ -225,9 +223,7 @@
// preserve the number of refs in the queue
MessageReference ref = (MessageReference)messageRefs.removeLast();
-
- log.info("Adding ref to downcache");
-
+
addToDownCache(ref, true);
}
}
@@ -316,16 +312,12 @@
{
ref.setPagingOrder(firstPagingOrder - 1);
- log.info("Cancelling so set paging order to: " + (firstPagingOrder - 1));
-
firstPagingOrder--;
}
else
{
ref.setPagingOrder(nextPagingOrder);
- log.info("Adding so set paging order to: " + nextPagingOrder);
-
nextPagingOrder++;
}
@@ -333,14 +325,10 @@
if (trace) { log.trace(ref + " sent to downcache"); }
- log.info("Added to down cache, down cache size:" + downCache.size());
-
if (downCache.size() == downCacheSize)
{
if (trace) { log.trace(this + "'s downcache is full (" + downCache.size() + " messages)"); }
-
- log.info("flushing down cache");
-
+
flushDownCache();
}
}
@@ -375,12 +363,10 @@
if (!toAdd.isEmpty())
{
- log.info("Adding refs: " + toAdd.size());
pm.addReferences(channelID, toAdd);
}
if (!toUpdate.isEmpty())
{
- log.info("Updating refs: " + toAdd.size());
pm.updatePageOrder(channelID, toUpdate);
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCServiceSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCServiceSupport.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCServiceSupport.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -91,8 +91,6 @@
{
this();
- log.info(this + " being created, tx mgr is " + tm);
-
this.ds = ds;
this.tm = tm;
@@ -110,8 +108,6 @@
protected void startService() throws Exception
{
- log.info(this + " startService");
-
try
{
if (ds == null)
@@ -299,8 +295,6 @@
Connection conn = null;
TransactionWrapper tx = new TransactionWrapper();
- log.info(this + " createSchema");
-
try
{
conn = ds.getConnection();
Modified: trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredExchangeSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredExchangeSupport.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredExchangeSupport.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -147,15 +147,11 @@
protected void startService() throws Exception
{
controlChannel.connect(groupName);
- log.info("Connected to control channel");
dataChannel.connect(groupName);
- log.info("Connected to data channel");
-
+
currentAddress = controlChannel.getLocalAddress();
-
- log.info("My address is: " + currentAddress);
-
+
super.startService();
handleAddressNodeMapping(currentAddress, nodeId);
@@ -202,15 +198,11 @@
{
// TODO I need to know whether this call times out - how do I know this??
boolean isState = controlChannel.getState(null, GET_STATE_TIMEOUT);
-
- log.info(this + " load bindings, isState=" + isState);
-
+
if (!isState)
{
//Must be first member in group or non clustered- we load the state ourself from the database
- log.info("loading bindings from db");
super.loadBindings();
- log.info("loaded bindings from db");
}
else
{
@@ -221,13 +213,10 @@
//TODO we should implement a timeout on this
while (!stateSet)
{
- log.info("Waiting for state to arrive");
setStateLock.wait();
}
}
}
-
- log.info(this + " loadBindings complete");
}
// Protected ---------------------------------------------------------------------------------------
@@ -259,8 +248,6 @@
{
lock.writeLock().acquire();
- log.info("node " + this.nodeId + " received request to add binding from node " + nodeId);
-
try
{
//Sanity
@@ -287,13 +274,9 @@
binding = new SimpleBinding(nodeId, queueName, condition, filterString,
noLocal, channelID, durable);
- log.info("Created binding");
-
binding.activate();
addBinding(binding);
-
- log.info("Added it");
}
finally
{
@@ -306,8 +289,6 @@
*/
private void removeBindingFromCluster(String nodeId, String queueName) throws Exception
{
- log.info(this.nodeId + " removing binding from cluster for nodeId: " + nodeId + " and queuename: " + queueName);
-
lock.writeLock().acquire();
try
@@ -332,7 +313,6 @@
try
{
- log.info("Handling node address mapping for: " + address + " and " + nodeId);
nodeIdAddressMap.put(nodeId, address.toString());
}
finally
@@ -345,8 +325,6 @@
{
lock.writeLock().acquire();
- log.info("Removing bindings for address: " + address);
-
try
{
Iterator iter = nodeIdAddressMap.entrySet().iterator();
@@ -369,13 +347,10 @@
throw new IllegalStateException("Cannot find node id for address: " + address);
}
- log.info("This address corresponds to node id: " + nodeId);
-
Map nameMap = (Map)nameMaps.get(nodeId);
if (nameMap != null)
{
- log.info("Found the name map");
List toRemove = new ArrayList();
iter = nameMap.values().iterator();
@@ -384,17 +359,10 @@
{
Binding binding = (Binding)iter.next();
- log.info("Got a binding");
-
if (!binding.isDurable())
{
- log.info("It's not - durable");
toRemove.add(binding);
}
- else
- {
- log.info("It IS durable - not removing it");
- }
}
iter = toRemove.iterator();
@@ -404,7 +372,6 @@
Binding binding = (Binding)iter.next();
removeBinding(nodeId, binding.getQueueName());
- log.info("removed binding");
}
}
}
@@ -529,7 +496,6 @@
{
public byte[] getState()
{
- log.info(this + " getState called");
try
{
lock.writeLock().acquire();
@@ -561,9 +527,6 @@
public void setState(byte[] bytes)
{
- log.info(this + " setState called");
- log.info("state is: " + bytes);
-
if (bytes != null)
{
@@ -590,17 +553,12 @@
lock.writeLock().release();
}
}
-
- log.info("Set the state");
-
+
synchronized (setStateLock)
{
stateSet = true;
setStateLock.notify();
}
-
- log.info("Notified");
-
}
}
@@ -635,14 +593,10 @@
{
try
{
- log.info("Received message:" + message);
-
//TODO handle deserialization more efficiently
Object object = message.getObject();
- log.info("Object is: " + object);
-
if (object instanceof MessageRequest)
{
MessageRequest request = (MessageRequest)object;
@@ -653,7 +607,6 @@
{
ref = ms.reference(request.getMessage());
- log.info("Routing it internally");
routeFromCluster(ref, request.getRoutingKey());
}
finally
@@ -697,8 +650,6 @@
public void viewAccepted(View view)
{
- log.info(" *****************************New view" + view);
-
if (currentView != null)
{
Iterator iter = currentView.getMembers().iterator();
@@ -710,7 +661,6 @@
if (!view.containsMember(address))
{
//Member must have left
- log.info(nodeId + " The following member has left: " + address);
//We don't remove bindings for ourself
@@ -753,9 +703,7 @@
//TODO handle deserialization more efficiently
Object request = message.getObject();
-
- log.info("Received request: " + request);
-
+
if (request instanceof BindRequest)
{
BindRequest br = (BindRequest)request;
Modified: trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredTopicExchange.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredTopicExchange.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/src/main/org/jboss/messaging/core/plugin/exchange/ClusteredTopicExchange.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -224,9 +224,7 @@
tx.addKeyedCallback(callback, this);
}
-
- log.info("Got callback:" + callback);
-
+
callback.addMessage(routingKey, ref.getMessage());
}
}
@@ -304,7 +302,6 @@
private void addMessage(String routingKey, Message message)
{
- log.info("Adding message");
messages.add(new MessageHolder(routingKey, message));
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/exchange/ExchangeSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/exchange/ExchangeSupport.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/src/main/org/jboss/messaging/core/plugin/exchange/ExchangeSupport.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -118,9 +118,7 @@
protected void startService() throws Exception
{
super.startService();
-
- log.info(this + " starting");
-
+
loadBindings();
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/exchange/TopicExchange.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/exchange/TopicExchange.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/src/main/org/jboss/messaging/core/plugin/exchange/TopicExchange.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -100,8 +100,6 @@
try
{
- log.info("Routing message with key: " + routingKey);
-
//We route on the condition
List bindings = (List)conditionMap.get(routingKey);
Modified: trunk/src/main/org/jboss/messaging/core/refqueue/PrioritizedDequeIterator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/refqueue/PrioritizedDequeIterator.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/src/main/org/jboss/messaging/core/refqueue/PrioritizedDequeIterator.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -60,15 +60,12 @@
{
if (currentIter.hasNext())
{
- // log.info("has next");
return true;
}
while (index >= 0)
- {
- //log.info("doesn't has next, index is:" + index);
+ {
if (index == 0 || currentIter.hasNext())
{
- // log.info("breaking, current has next:" + currentIter.hasNext());
break;
}
index--;
Modified: trunk/tests/src/org/jboss/test/messaging/core/local/RoundRobinPointToPointRouterTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/local/RoundRobinPointToPointRouterTest.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/tests/src/org/jboss/test/messaging/core/local/RoundRobinPointToPointRouterTest.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -434,7 +434,6 @@
protected void checkReceiverGotRef(SimpleReceiver[] receivers, int pos)
{
- log.info("checkReceiverGotRef:" + pos);
for (int i = 0; i < receivers.length; i++)
{
SimpleReceiver r = receivers[i];
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -128,8 +128,6 @@
protected void assertSameIds(List ids, MessageReference[] refs, int start, int end)
{
- log.info("&&&&&& size is " + ids.size());
-
assertNotNull(ids);
assertEquals(ids.size(), end - start + 1);
Iterator iter = ids.iterator();
@@ -137,12 +135,9 @@
while (iter.hasNext())
{
Long id = (Long)iter.next();
- log.info("id is:" + id);
assertEquals(refs[i].getMessageID(), id.longValue());
i++;
}
-
- log.info("&&& done");
}
class ConsumingReceiver implements Receiver
@@ -442,13 +437,7 @@
long msgId = rs.getLong(1);
long ord = rs.getLong(2);
long pageOrd = rs.getLong(3);
- if (rs.wasNull())
- {
- log.info("!NULL");
- }
- log.info("msgId: " + msgId + " ord: " + ord + " pageOrd: " + pageOrd);
-
msgIds.add(new Long(msgId));
}
rs.close();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -888,16 +888,11 @@
//Cancel the last 10
- log.info("**** cancelling");
-
for (int i = 9; i >= 0; i--)
{
dels[i].cancel();
}
- log.info("**** cancelled");
-
-
//This should cause the down cache to be flushed
//verify 20 ref in storage
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredTopicExchangeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredTopicExchangeTest.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredTopicExchangeTest.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -168,9 +168,7 @@
//Add another binding on node 1
Binding binding4 = exchange2.bindQueue("sub4", "topic1", null, false, false, ms, pm, 20000, 100, 100);
-
- log.info("here 1");
-
+
// Make sure both nodes pick it up
bindings = exchange1.listBindingsForWildcard("topic1");
@@ -292,11 +290,9 @@
assertEquivalent(binding6, (Binding)bindings.get(3));
assertEquivalent(binding7, (Binding)bindings.get(4));
- log.info("Stopping exchange 1");
//Stop exchange 1
exchange1.stop();
- log.info("Stopped exchange 1");
-
+
//Need to sleep since it may take some time for the view changed request to reach the
//members which causes the bindings to be removed
@@ -305,7 +301,6 @@
//All it's non durable bindings should be removed from the other nodes
//Durable bindings should remain
- log.info("getting bindingd for wildcard");
bindings = exchange2.listBindingsForWildcard("topic1");
assertNotNull(bindings);
assertEquals(4, bindings.size());
@@ -646,7 +641,6 @@
for (int i = 0; i < 16; i++)
{
- log.info("i is: " + i);
List msgs = receivers[i].getMessages();
assertNotNull(msgs);
assertTrue(msgs.isEmpty());
@@ -780,9 +774,7 @@
assertTrue(msgs.isEmpty());
}
- log.info("*** COMMITTING THE TX");
tx.commit();
- log.info("*** COMMITTED THE TX");
for (int i = 0; i < 16; i++)
{
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/DirectExchangeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/DirectExchangeTest.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/DirectExchangeTest.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -399,12 +399,7 @@
assertEquals(1, msgs.size());
Message msgRec = (Message)msgs.get(0);
assertTrue(msg1 == msgRec);
-
- if (msg1 == msgRec)
- {
- log.info("&&&&&&&&&&&&&& THEY ARE ONE AND THE SAME");
- }
-
+
receiver1.acknowledge(msgRec, null);
msgs = queue1.browse();
assertNotNull(msgs);
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -785,13 +785,6 @@
assertNotNull(refInfos);
assertEquals(6, refInfos.size());
- log.info("msg id: " + ((PersistenceManager.ReferenceInfo)refInfos.get(0)).getMessageId());
- log.info("msg id: " + ((PersistenceManager.ReferenceInfo)refInfos.get(1)).getMessageId());
- log.info("msg id: " + ((PersistenceManager.ReferenceInfo)refInfos.get(2)).getMessageId());
- log.info("msg id: " + ((PersistenceManager.ReferenceInfo)refInfos.get(3)).getMessageId());
- log.info("msg id: " + ((PersistenceManager.ReferenceInfo)refInfos.get(4)).getMessageId());
- log.info("msg id: " + ((PersistenceManager.ReferenceInfo)refInfos.get(5)).getMessageId());
-
assertEquals(ref1.getMessageID(), ((PersistenceManager.ReferenceInfo)refInfos.get(0)).getMessageId());
assertEquals(ref2.getMessageID(), ((PersistenceManager.ReferenceInfo)refInfos.get(1)).getMessageId());
assertEquals(ref3.getMessageID(), ((PersistenceManager.ReferenceInfo)refInfos.get(2)).getMessageId());
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/base/ExchangeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/base/ExchangeTestBase.java 2006-09-01 22:07:43 UTC (rev 1252)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/base/ExchangeTestBase.java 2006-09-01 22:17:53 UTC (rev 1253)
@@ -440,7 +440,6 @@
protected void assertEquivalent(Binding binding1, Binding binding2)
{
assertEquals(binding1.getNodeId(), binding2.getNodeId());
- log.info("b1:" + binding1.getQueueName() + " b2:" + binding2.getQueueName());
assertEquals(binding1.getQueueName(), binding2.getQueueName());
assertEquals(binding1.getSelector(), binding2.getSelector());
assertEquals(binding1.getChannelId(), binding2.getChannelId());
More information about the jboss-cvs-commits
mailing list