JBoss hornetq SVN: r11136 - tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-08-05 03:23:26 -0400 (Fri, 05 Aug 2011)
New Revision: 11136
Added:
tags/HornetQ_2_2_7_Final_pending/
Log:
pending release for 2.2.7.Final
13 years, 7 months
JBoss hornetq SVN: r11135 - tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-08-05 03:22:29 -0400 (Fri, 05 Aug 2011)
New Revision: 11135
Removed:
tags/HornetQ_2_2_7_Final_pending/
Log:
unneeded branch
13 years, 7 months
JBoss hornetq SVN: r11134 - branches/Branch_2_2_AS7/docs.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-08-05 03:14:40 -0400 (Fri, 05 Aug 2011)
New Revision: 11134
Modified:
branches/Branch_2_2_AS7/docs/README.html
Log:
updated release notes
Modified: branches/Branch_2_2_AS7/docs/README.html
===================================================================
--- branches/Branch_2_2_AS7/docs/README.html 2011-08-05 05:03:17 UTC (rev 11133)
+++ branches/Branch_2_2_AS7/docs/README.html 2011-08-05 07:14:40 UTC (rev 11134)
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="content-type">
- <title>HornetQ 2.2.6 Final Release Notes</title>
+ <title>HornetQ 2.2.7 Final Release Notes</title>
</head>
<body>
13 years, 7 months
JBoss hornetq SVN: r11133 - branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-05 01:03:17 -0400 (Fri, 05 Aug 2011)
New Revision: 11133
Modified:
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
Log:
tweak for test
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-08-05 04:43:33 UTC (rev 11132)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-08-05 05:03:17 UTC (rev 11133)
@@ -799,6 +799,8 @@
// session.close();
//
// }
+
+ session.cleanUp(false);
if (session != null)
{
13 years, 7 months
JBoss hornetq SVN: r11132 - branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-05 00:43:33 -0400 (Fri, 05 Aug 2011)
New Revision: 11132
Modified:
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
Log:
tweak
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-08-05 04:22:43 UTC (rev 11131)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-08-05 04:43:33 UTC (rev 11132)
@@ -800,15 +800,16 @@
//
// }
- session.removeFailureListener(BridgeImpl.this);
+ if (session != null)
+ {
+ session.removeFailureListener(BridgeImpl.this);
+ }
if (csf != null)
{
csf.cleanup();
}
- serverLocator.close();
-
synchronized (BridgeImpl.this)
{
log.debug("Closing Session for bridge " + BridgeImpl.this.name);
13 years, 7 months
JBoss hornetq SVN: r11131 - branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/timing/jms/bridge/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-05 00:22:43 -0400 (Fri, 05 Aug 2011)
New Revision: 11131
Modified:
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
Log:
fix thread leakage
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2011-08-05 04:17:52 UTC (rev 11130)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2011-08-05 04:22:43 UTC (rev 11131)
@@ -210,6 +210,8 @@
Thread.sleep(50);
Assert.assertFalse(bridge.isStarted());
Assert.assertTrue(bridge.isFailed());
+
+ bridge.stop();
}
13 years, 7 months
JBoss hornetq SVN: r11130 - in branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-05 00:17:52 -0400 (Fri, 05 Aug 2011)
New Revision: 11130
Modified:
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
Log:
tweaks
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-08-05 03:13:03 UTC (rev 11129)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-08-05 04:17:52 UTC (rev 11130)
@@ -84,7 +84,7 @@
private boolean receivedTopology;
private boolean compressLargeMessage;
-
+
// if the system should shutdown the pool when shutting down
private transient boolean shutdownPool;
@@ -252,13 +252,12 @@
private void setThreadPools()
{
- if (threadPool != null)
- {
- return;
- }
- else
- if (useGlobalPools)
+ if (threadPool != null)
{
+ return;
+ }
+ else if (useGlobalPools)
+ {
threadPool = getGlobalThreadPool();
scheduledThreadPool = getGlobalScheduledThreadPool();
@@ -266,7 +265,7 @@
else
{
this.shutdownPool = true;
-
+
ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-factory-threads-" + System.identityHashCode(this),
true,
getThisClassLoader());
@@ -369,19 +368,19 @@
private ServerLocatorImpl(final Topology topology,
final boolean useHA,
- final ExecutorService threadPool,
- final ScheduledExecutorService scheduledExecutor,
+ final ExecutorService threadPool,
+ final ScheduledExecutorService scheduledExecutor,
final DiscoveryGroupConfiguration discoveryGroupConfiguration,
final TransportConfiguration[] transportConfigs)
{
e.fillInStackTrace();
-
+
this.scheduledThreadPool = scheduledExecutor;
-
+
this.threadPool = threadPool;
-
+
this.topology = topology;
-
+
this.ha = useHA;
this.discoveryGroupConfiguration = discoveryGroupConfiguration;
@@ -480,10 +479,14 @@
* @param discoveryAddress
* @param discoveryPort
*/
- public ServerLocatorImpl(final Topology topology, final boolean useHA, final ExecutorService threadPool, final ScheduledExecutorService scheduledExecutor, final DiscoveryGroupConfiguration groupConfiguration)
+ public ServerLocatorImpl(final Topology topology,
+ final boolean useHA,
+ final ExecutorService threadPool,
+ final ScheduledExecutorService scheduledExecutor,
+ final DiscoveryGroupConfiguration groupConfiguration)
{
this(topology, useHA, threadPool, scheduledExecutor, groupConfiguration, null);
-
+
}
/**
@@ -491,7 +494,11 @@
*
* @param transportConfigs
*/
- public ServerLocatorImpl(final Topology topology, final boolean useHA, final ExecutorService threadPool, final ScheduledExecutorService scheduledExecutor, final TransportConfiguration... transportConfigs)
+ public ServerLocatorImpl(final Topology topology,
+ final boolean useHA,
+ final ExecutorService threadPool,
+ final ScheduledExecutorService scheduledExecutor,
+ final TransportConfiguration... transportConfigs)
{
this(topology, useHA, threadPool, scheduledExecutor, null, transportConfigs);
}
@@ -565,7 +572,7 @@
addFactory(sf);
return sf;
}
-
+
public boolean isClosed()
{
return closed || closing;
@@ -697,10 +704,12 @@
if (ha || clusterConnection)
{
long timeout = System.currentTimeMillis() + 30000;
- while (!ServerLocatorImpl.this.closed && !ServerLocatorImpl.this.closing && !receivedTopology && timeout > System.currentTimeMillis())
+ while (!ServerLocatorImpl.this.closed && !ServerLocatorImpl.this.closing &&
+ !receivedTopology &&
+ timeout > System.currentTimeMillis())
{
// Now wait for the topology
-
+
try
{
wait(1000);
@@ -711,7 +720,7 @@
}
- if (System.currentTimeMillis() > timeout && ! receivedTopology && !closed && !closing)
+ if (System.currentTimeMillis() > timeout && !receivedTopology && !closed && !closing)
{
throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT,
"Timed out waiting to receive cluster topology");
@@ -1237,7 +1246,7 @@
}
topology.removeMember(nodeID);
-
+
if (!topology.isEmpty())
{
updateArraysAndPairs();
@@ -1257,8 +1266,8 @@
}
public void notifyNodeUp(final String nodeID,
- final Pair<TransportConfiguration, TransportConfiguration> connectorPair,
- final boolean last)
+ final Pair<TransportConfiguration, TransportConfiguration> connectorPair,
+ final boolean last)
{
if (!clusterConnection && !ha)
{
@@ -1275,7 +1284,8 @@
if (log.isDebugEnabled())
{
- log.debug("XXX ZZZ NodeUp " + this + "::nodeID=" + nodeID + ", connectorPair=" + connectorPair, new Exception ("trace"));
+ log.debug("XXX ZZZ NodeUp " + this + "::nodeID=" + nodeID + ", connectorPair=" + connectorPair,
+ new Exception("trace"));
}
topology.addMember(nodeID, new TopologyMember(connectorPair), last);
@@ -1335,7 +1345,7 @@
private synchronized void updateArraysAndPairs()
{
Collection<TopologyMember> membersCopy = topology.getMembers();
-
+
topologyArray = (Pair<TransportConfiguration, TransportConfiguration>[])Array.newInstance(Pair.class,
membersCopy.size());
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-08-05 03:13:03 UTC (rev 11129)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2011-08-05 04:17:52 UTC (rev 11130)
@@ -791,19 +791,24 @@
try
{
log.debug("stopping bridge " + BridgeImpl.this);
-
- if (session != null)
- {
- log.debug("Cleaning up session " + session);
- session.close();
- session.removeFailureListener(BridgeImpl.this);
- }
+///////////////
+// if (session != null)
+// {
+// log.debug("Cleaning up session " + session);
+// session.close();
+//
+// }
+
+ session.removeFailureListener(BridgeImpl.this);
+
if (csf != null)
{
csf.cleanup();
}
+ serverLocator.close();
+
synchronized (BridgeImpl.this)
{
log.debug("Closing Session for bridge " + BridgeImpl.this.name);
13 years, 7 months
JBoss hornetq SVN: r11129 - branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-04 23:13:03 -0400 (Thu, 04 Aug 2011)
New Revision: 11129
Modified:
branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
tweak
Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-08-05 02:36:17 UTC (rev 11128)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-08-05 03:13:03 UTC (rev 11129)
@@ -1510,6 +1510,16 @@
private synchronized void createConnectors()
{
+ if (connectors != null)
+ {
+ for (Connector conn : connectors)
+ {
+ if (conn != null)
+ {
+ conn.disconnect();
+ }
+ }
+ }
connectors = new ArrayList<Connector>();
for (TransportConfiguration initialConnector : initialConnectors)
{
@@ -1605,7 +1615,7 @@
if (factory != null)
{
factory.causeExit();
- factory.close();
+ factory.cleanup();
factory = null;
}
}
13 years, 7 months
JBoss hornetq SVN: r11128 - branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-04 22:36:17 -0400 (Thu, 04 Aug 2011)
New Revision: 11128
Modified:
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/MessageSender.java
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/SpringIntegrationTest.java
Log:
fixing thread leakage on test
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/MessageSender.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/MessageSender.java 2011-08-05 00:56:43 UTC (rev 11127)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/MessageSender.java 2011-08-05 02:36:17 UTC (rev 11128)
@@ -47,6 +47,7 @@
MessageProducer producer = session.createProducer(destination);
TextMessage message = session.createTextMessage(msg);
producer.send(message);
+ conn.close();
}
catch (Exception ex)
{
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/SpringIntegrationTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/SpringIntegrationTest.java 2011-08-05 00:56:43 UTC (rev 11127)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/spring/SpringIntegrationTest.java 2011-08-05 02:36:17 UTC (rev 11128)
@@ -2,10 +2,12 @@
import junit.framework.Assert;
+import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.jms.server.embedded.EmbeddedJMS;
import org.hornetq.tests.util.UnitTestCase;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.jms.listener.DefaultMessageListenerContainer;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -24,11 +26,21 @@
sender.send("Hello world");
Thread.sleep(100);
Assert.assertEquals(ExampleListener.lastMessage, "Hello world");
+ ((HornetQConnectionFactory)sender.getConnectionFactory()).close();
}
finally
{
try
{
+ DefaultMessageListenerContainer container = (DefaultMessageListenerContainer)context.getBean("listenerContainer");
+ container.stop();
+ }
+ catch (Throwable ignored)
+ {
+ ignored.printStackTrace();
+ }
+ try
+ {
EmbeddedJMS jms = (EmbeddedJMS)context.getBean("EmbeddedJms");
jms.stop();
}
13 years, 7 months
JBoss hornetq SVN: r11127 - branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-08-04 20:56:43 -0400 (Thu, 04 Aug 2011)
New Revision: 11127
Modified:
branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java
Log:
enabling test
Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java 2011-08-05 00:39:07 UTC (rev 11126)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/NIOvsOIOTest.java 2011-08-05 00:56:43 UTC (rev 11127)
@@ -49,45 +49,35 @@
// Public --------------------------------------------------------
- public static TestSuite suite()
+ public void testNIOPerf() throws Exception
{
- return new TestSuite();
+ testPerf(true);
}
-// public void testNIOPerf() throws Exception
-// {
-// log.info("************* Testing NIO");
-// testPerf(true);
-// }
-//
-// public void testOIOPerf() throws Exception
-// {
-// log.info("************ Testing OIO");
-// testPerf(false);
-// }
+ public void testOIOPerf() throws Exception
+ {
+ testPerf(false);
+ }
private void doTest(String dest) throws Exception
{
- System.getProperties().put("hq.batchHQ", "true");
- String connectorFactoryClassName = "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory";
-
-
final int numSenders = 1;
final int numReceivers = 1;
- final int numMessages = 200000;
+ final int numMessages = 20000;
Receiver[] receivers = new Receiver[numReceivers];
Sender[] senders = new Sender[numSenders];
List<ClientSessionFactory> factories = new ArrayList<ClientSessionFactory>();
+
+ ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
for (int i = 0; i < numReceivers; i++)
{
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
ClientSessionFactory sf = locator.createSessionFactory();
@@ -102,8 +92,6 @@
for (int i = 0; i < numSenders; i++)
{
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
-
ClientSessionFactory sf = locator.createSessionFactory();
factories.add(sf);
@@ -134,7 +122,7 @@
double rate = 1000 * (double)(numMessages * numSenders) / (end - start);
- log.info("Rate is " + rate + " msgs sec");
+ logAndSystemOut("Rate is " + rate + " msgs sec");
for (int i = 0; i < numSenders; i++)
{
@@ -150,6 +138,8 @@
{
sf.close();
}
+
+ locator.close();
}
private void testPerf(boolean nio) throws Exception
@@ -217,7 +207,7 @@
void prepare() throws Exception
{
- session = sf.createSession();
+ session = sf.createSession(true, true);
producer = session.createProducer(dest);
}
@@ -277,7 +267,7 @@
void prepare() throws Exception
{
- session = sf.createSession();
+ session = sf.createSession(true, true, 0);
queueName = UUIDGenerator.getInstance().generateStringUUID();
13 years, 7 months