[hornetq-commits] JBoss hornetq SVN: r9122 - in trunk: src/config/jboss-as/non-clustered and 7 other directories.

Author: timfox Date: 2010-04-15 06:38:36 -0400 (Thu, 15 Apr 2010) New Revision: 9122 Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml trunk/src/config/stand-alone/clustered/hornetq-configuration.xml trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml trunk/src/config/trunk/clustered/hornetq-configuration.xml trunk/src/config/trunk/non-clustered/hornetq-configuration.xml trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java Log: some small fixes and corrections to config Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-15 10:38:36 UTC (rev 9122) @@ -25,7 +25,7 @@ <connector name="netty-throughput"> <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> </connector> Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-15 10:38:36 UTC (rev 9122) @@ -23,7 +23,7 @@ <connector name="netty-throughput"> <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> </connector> Modified: trunk/src/config/stand-alone/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-15 10:38:36 UTC (rev 9122) @@ -23,7 +23,7 @@ <connector name="netty-throughput"> <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> </connector> Modified: trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-15 10:38:36 UTC (rev 9122) @@ -21,7 +21,7 @@ <connector name="netty-throughput"> <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> </connector> Modified: trunk/src/config/trunk/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-15 10:38:36 UTC (rev 9122) @@ -15,7 +15,7 @@ <connector name="netty-throughput"> <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> </connector> Modified: trunk/src/config/trunk/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-15 10:38:36 UTC (rev 9122) @@ -13,7 +13,7 @@ <connector name="netty-throughput"> <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${jboss.bind.address:localhost}"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="port" value="${hornetq.remoting.netty.port:5455}"/> <param key="batch-delay" value="50"/> </connector> Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-04-15 10:38:36 UTC (rev 9122) @@ -264,7 +264,6 @@ unbindJNDI(topicJNDI); unbindJNDI(connectionFactoryJNDI); - for (String connectionFactory : new HashSet<String>(connectionFactories.keySet())) { @@ -273,10 +272,10 @@ connectionFactories.clear(); connectionFactoryJNDI.clear(); - + queueJNDI.clear(); queues.clear(); - + topicJNDI.clear(); topics.clear(); @@ -803,8 +802,7 @@ final String... jndiBindings) throws Exception { log.info("calling create cf " + discoveryRefreshTimeout + " lba " + localBindAddress); - - + checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) @@ -1470,18 +1468,21 @@ */ private void unbindJNDI(Map<String, List<String>> param) { - for (List<String> elementList : param.values()) + if (context != null) { - for (String key : elementList) + for (List<String> elementList : param.values()) { - try + for (String key : elementList) { - context.unbind(key); + try + { + context.unbind(key); + } + catch (Exception e) + { + log.warn("Impossible to unbind key " + key + " from JNDI", e); + } } - catch (Exception e) - { - log.warn("Impossible to unbind key " + key + " from JNDI"); - } } } } @@ -1592,7 +1593,9 @@ storage.start(); } - private synchronized boolean removeFromJNDI(final Map<String, ?> keys, 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.remove(name); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2010-04-15 10:38:36 UTC (rev 9122) @@ -144,6 +144,19 @@ } } } + + public void test() throws Exception + { + for (int i = 0; i < 1000000; i++) + { + log.info("** ITER "+ i); + + this.testStopBridgeWithFailureWhenStarted(); + tearDown(); + + setUp(); + } + } /** * https://jira.jboss.org/jira/browse/HORNETQ-287 Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-04-15 09:45:07 UTC (rev 9121) +++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-04-15 10:38:36 UTC (rev 9122) @@ -259,6 +259,7 @@ baos.write(frame.getBytes("UTF-8")); baos.write(data); baos.write('\0'); + baos.flush(); sendFrame(baos.toByteArray()); BytesMessage message = (BytesMessage)consumer.receive(10000);