User: ejort
Date: 02/01/04 22:38:13
Modified: src/main/org/jboss/mq/server JMSServer.java
MessageCache.java StateManager.java
Log:
Guarded debug logging
Revision Changes Path
1.12 +9 -5 jbossmq/src/main/org/jboss/mq/server/JMSServer.java
Index: JMSServer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JMSServer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JMSServer.java 2001/11/26 06:33:12 1.11
+++ JMSServer.java 2002/01/05 06:38:13 1.12
@@ -37,7 +37,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class JMSServer
{
@@ -691,7 +691,8 @@
*/
public synchronized Queue createQueue(ConnectionToken dc, String name) throws
JMSException
{
- log.debug("createQueue(" + name + ")");
+ if (log.isDebugEnabled())
+ log.debug("createQueue(" + name + ")");
SpyQueue newQueue = new SpyQueue(name);
if (!destinations.containsKey(newQueue))
@@ -711,7 +712,8 @@
*/
public synchronized Topic createTopic(ConnectionToken dc, String name) throws
JMSException
{
- log.debug("createTopic(" + name + ")");
+ if (log.isDebugEnabled())
+ log.debug("createTopic(" + name + ")");
SpyTopic newTopic = new SpyTopic(name);
if (!destinations.containsKey(newTopic))
@@ -729,7 +731,8 @@
*/
public synchronized void deleteTemporaryDestination(ConnectionToken dc,
SpyDestination dest)
{
- log.debug("deleteDestination(dest=" + dest.toString() + ")");
+ if (log.isDebugEnabled())
+ log.debug("deleteDestination(dest=" + dest.toString() + ")");
synchronized (destinations)
{
@@ -765,7 +768,8 @@
*/
public void addDestination(SpyDestination topic, JMSDestination queue) throws
JMSException
{
- log.debug("addDestination: " + topic + ", " + queue);
+ if (log.isDebugEnabled())
+ log.debug("addDestination: " + topic + ", " + queue);
if (destinations.containsKey(topic))
{
throw new JMSException("This destination already exists !");
1.12 +8 -15 jbossmq/src/main/org/jboss/mq/server/MessageCache.java
Index: MessageCache.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/MessageCache.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MessageCache.java 2002/01/02 17:06:53 1.11
+++ MessageCache.java 2002/01/05 06:38:13 1.12
@@ -25,7 +25,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Hiram Chirino</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Maplesden</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class MessageCache extends ServiceMBeanSupport implements MessageCacheMBean,
MBeanRegistration, Runnable
{
@@ -63,8 +63,7 @@
*/
public MessageReference add(SpyMessage message) throws javax.jms.JMSException
{
- if (log.isTraceEnabled())
- log.trace("add lock aquire");
+ log.trace("add lock aquire");
synchronized (this)
{
MessageReference mh = new MessageReference();
@@ -73,8 +72,7 @@
totalCacheSize++;
validateSoftReferenceDepth();
- if (log.isTraceEnabled())
- log.trace("add lock release");
+ log.trace("add lock release");
return mh;
}
}
@@ -84,15 +82,13 @@
*/
public void remove(MessageReference mr) throws JMSException
{
- if (log.isTraceEnabled())
- log.trace("remove lock aquire");
+ log.trace("remove lock aquire");
synchronized (this)
{
mr.clear();
lruCache.remove(mr);
totalCacheSize--;
- if (log.isTraceEnabled())
- log.trace("remove lock release");
+ log.trace("remove lock release");
}
}
@@ -141,8 +137,7 @@
{
// Signal to exit the thread.
}
- if (log.isDebugEnabled())
- log.debug("Thread exiting.");
+ log.debug("Thread exiting.");
}
/**
@@ -197,16 +192,14 @@
*/
synchronized public void messageReferenceUsedEvent(MessageReference mh, boolean
wasHard)
{
- if (log.isTraceEnabled())
- log.trace("messageReferenceUsedEvent lock aquire");
+ log.trace("messageReferenceUsedEvent lock aquire");
synchronized (this)
{
if (wasHard)
lruCache.makeMostRecent(mh);
else
lruCache.addMostRecent(mh);
- if (log.isTraceEnabled())
- log.trace("messageReferenceUsedEvent lock released");
+ log.trace("messageReferenceUsedEvent lock released");
}
}
1.11 +12 -6 jbossmq/src/main/org/jboss/mq/server/StateManager.java
Index: StateManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/StateManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StateManager.java 2002/01/03 04:00:54 1.10
+++ StateManager.java 2002/01/05 06:38:13 1.11
@@ -35,7 +35,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class StateManager extends ServiceMBeanSupport implements StateManagerMBean
{
@@ -82,7 +82,9 @@
*/
public void setDurableSubscription(JMSServer server, DurableSubcriptionID sub,
SpyTopic topic) throws JMSException
{
- log.debug("Checking durable subscription: " + sub + ", on topic: " + topic);
+ boolean debug = log.isDebugEnabled();
+ if (debug)
+ log.debug("Checking durable subscription: " + sub + ", on topic: " +
topic);
try
{
//Set the known Ids
@@ -97,7 +99,8 @@
continue;
}
- log.debug("Found a matching ClientID configuration section.");
+ if (debug)
+ log.debug("Found a matching ClientID configuration section.");
XElement subscription = null;
@@ -115,7 +118,8 @@
if (subscription == null)
{
- log.debug("The subscription was not previously registered.");
+ if (debug)
+ log.debug("The subscription was not previously registered.");
// it was not previously registered...
if (topic == null)
{
@@ -135,7 +139,8 @@
}
else
{
- log.debug("The subscription was previously registered.");
+ if (debug)
+ log.debug("The subscription was previously registered.");
// it was previously registered...
if (topic == null)
{
@@ -151,7 +156,8 @@
else if (!subscription.getField("TopicName").equals(topic.getName()))
{
//new topic so we have to change it
- log.debug("But the topic was different, changing the
subscription.");
+ if (debug)
+ log.debug("But the topic was different, changing the
subscription.");
// we have to change the subscription...
SpyTopic prevTopic = new
SpyTopic(subscription.getField("TopicName"));
JMSTopic dest = (JMSTopic)server.getJMSDestination(prevTopic);
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
