You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/02/25 16:16:04 UTC
svn commit: r630872 - in
/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server:
handler/QueueDeclareHandler.java
registry/ConfigurationFileApplicationRegistry.java
Author: ritchiem
Date: Mon Feb 25 07:16:01 2008
New Revision: 630872
URL: http://svn.apache.org/viewvc?rev=630872&view=rev
Log:
QPID-809 Updated logging and some whitespace changes.
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java?rev=630872&r1=630871&r2=630872&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java Mon Feb 25 07:16:01 2008
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,6 +26,7 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.configuration.Configured;
+
import org.apache.qpid.framing.*;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.configuration.Configurator;
@@ -45,7 +46,7 @@
public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclareBody>
{
- private static final Logger _log = Logger.getLogger(QueueDeclareHandler.class);
+ private static final Logger _logger = Logger.getLogger(QueueDeclareHandler.class);
private static final QueueDeclareHandler _instance = new QueueDeclareHandler();
@@ -109,7 +110,7 @@
}
else
{
- queue = createQueue(queueName,body, virtualHost, session);
+ queue = createQueue(queueName, body, virtualHost, session);
if (queue.isDurable() && !queue.isAutoDelete())
{
store.createQueue(queue);
@@ -124,7 +125,7 @@
defaultExchange, queue, queueName);
queue.bind(queueName, null, defaultExchange);
- _log.info("Queue " + queueName + " bound to default exchange(" + defaultExchange.getName() + ")");
+ _logger.info("Queue " + queueName + " bound to default exchange(" + defaultExchange.getName() + ")");
}
}
}
@@ -156,7 +157,7 @@
queue.getConsumerCount());
session.writeFrame(responseBody.generateFrame(channelId));
- _log.info("Queue " + queueName + " declared successfully");
+ _logger.info("Queue " + queueName + " declared successfully");
}
}
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java?rev=630872&r1=630871&r2=630872&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java Mon Feb 25 07:16:01 2008
@@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -59,6 +59,7 @@
private VirtualHostRegistry _virtualHostRegistry;
+ //fixme Why is this not used.
private final Map<String, VirtualHost> _virtualHosts = new ConcurrentHashMap<String, VirtualHost>();
private PluginManager _pluginManager;
@@ -121,7 +122,7 @@
_managedObjectRegistry.start();
_pluginManager = new PluginManager(_configuration.getString("plugin-directory"));
-
+
initialiseVirtualHosts();
}
@@ -178,7 +179,7 @@
{
return getConfiguration().getList("virtualhosts.virtualhost.name");
}
-
+
public PluginManager getPluginManager()
{
return _pluginManager;