JBoss hornetq SVN: r9040 - trunk/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-01 04:12:35 -0400 (Thu, 01 Apr 2010)
New Revision: 9040
Modified:
trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java
Log:
removed log.info
Modified: trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-04-01 00:18:14 UTC (rev 9039)
+++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-04-01 08:12:35 UTC (rev 9040)
@@ -1168,7 +1168,6 @@
}
else if (status == HandleStatus.BUSY)
{
- log.info("busy");
if (holder.iter == null)
{
// Put the ref back
14 years, 1 month
- 1
- 0
JBoss hornetq SVN: r9039 - in trunk: tests/src/org/hornetq/tests/integration/jms/client and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-03-31 20:18:14 -0400 (Wed, 31 Mar 2010)
New Revision: 9039
Modified:
trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/src/org/hornetq/tests/integration/jms/client/StoreConfigTest.java
Log:
tweaks on storage config
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-03-31 23:19:43 UTC (rev 9038)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-04-01 00:18:14 UTC (rev 9039)
@@ -535,9 +535,9 @@
{
checkInitialised();
- if (removeFromJNDI(queueJNDI, name))
+ if (removeFromJNDI(queues, queueJNDI, name))
{
- storage.deleteJNDI(PersistedType.Queue, name);
+ storage.deleteDestination(PersistedType.Queue, name);
return true;
}
else
@@ -573,11 +573,11 @@
{
checkInitialised();
- boolean removed = removeFromJNDI(topicJNDI, name);
+ boolean removed = removeFromJNDI(topics, topicJNDI, name);
if (removed)
{
- storage.deleteJNDI(PersistedType.Topic, name);
+ storage.deleteDestination(PersistedType.Topic, name);
}
return removed;
@@ -606,9 +606,9 @@
{
checkInitialised();
- removeFromJNDI(connectionFactoryJNDI, name);
+ removeFromJNDI(connectionFactories, connectionFactoryJNDI, name);
- storage.deleteJNDI(PersistedType.Topic, name);
+ storage.deleteConnectionFactory(name);
return true;
}
@@ -617,7 +617,7 @@
{
checkInitialised();
- removeFromJNDI(queueJNDI, name);
+ removeFromJNDI(queues, queueJNDI, name);
queues.remove(name);
queueJNDI.remove(name);
@@ -635,7 +635,7 @@
{
checkInitialised();
- removeFromJNDI(topicJNDI, name);
+ removeFromJNDI(topics, topicJNDI, name);
topics.remove(name);
topicJNDI.remove(name);
@@ -1582,14 +1582,18 @@
storage.start();
}
- private synchronized boolean removeFromJNDI(final Map<String, List<String>> jndiMap, final String name) throws Exception
+ private synchronized boolean removeFromJNDI(final Map<String, ?> keys, final Map<String, List<String>> jndiMap, final String name) throws Exception
{
checkInitialised();
- List<String> jndiBindings = jndiMap.get(name);
+ List<String> jndiBindings = jndiMap.remove(name);
if (jndiBindings == null || jndiBindings.size() == 0)
{
return false;
}
+ else
+ {
+ keys.remove(name);
+ }
if (context != null)
{
Iterator<String> iter = jndiBindings.iterator();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/StoreConfigTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/StoreConfigTest.java 2010-03-31 23:19:43 UTC (rev 9038)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/StoreConfigTest.java 2010-04-01 00:18:14 UTC (rev 9039)
@@ -183,8 +183,17 @@
checkDestination("/t1");
checkDestination("/t.1");
+
+ jmsServer.removeTopicFromJNDI("topicOne");
+
+ assertTrue(jmsServer.createTopic(true, "topicOne", "/topicx.1", "/topicx.2"));
jmsServer.stop();
+
+ jmsServer.start();
+
+ checkDestination("/topicx.1");
+ checkDestination("/topicx.2");
}
@@ -282,6 +291,18 @@
assertNullJNDI("/q1");
checkDestination("/q.1");
checkDestination("/qI");
+
+ jmsServer.removeQueueFromJNDI("queue1");
+
+
+ assertTrue(jmsServer.createQueue(true, "queue1", null, true, "/newq1", "/newq.1"));
+ assertNullJNDI("/q1");
+ assertNullJNDI("/q.1");
+ assertNullJNDI("/qI");
+
+ checkDestination("/newq1");
+ checkDestination("newq.1");
+
jmsServer.stop();
}
14 years, 1 month
- 1
- 0