[hornetq-commits] JBoss hornetq SVN: r9159 - in trunk: src/main/org/hornetq/jms/client and 1 other directories.
Author: timfox
Date: 2010-04-23 10:44:27 -0400 (Fri, 23 Apr 2010)
New Revision: 9159
Modified:
trunk/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java
trunk/src/main/org/hornetq/jms/client/HornetQConnection.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-315
Modified: trunk/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java 2010-04-23
13:39:19 UTC (rev 9158)
+++ trunk/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java 2010-04-23
14:44:27 UTC (rev 9159)
@@ -203,7 +203,7 @@
public Packet sendBlocking(final Packet packet) throws HornetQException
{
- if (closed)
+ if (connection.isDestroyed())
{
throw new HornetQException(HornetQException.NOT_CONNECTED, "Connection is
destroyed");
}
Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnection.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-04-23 13:39:19 UTC
(rev 9158)
+++ trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-04-23 14:44:27 UTC
(rev 9159)
@@ -250,6 +250,8 @@
{
return;
}
+
+ sessionFactory.close();
try
{
@@ -258,17 +260,10 @@
session.close();
}
- // TODO may be a better way of doing this that doesn't involve creating a
new session
-
try
{
if (!tempQueues.isEmpty())
{
-// if (initialSession == null)
-// {
-// initialSession = sessionFactory.createSession(username, password,
false, true, true, false, 0);
-// }
-
// Remove any temporary queues
for (SimpleString queueName : tempQueues)
@@ -295,8 +290,6 @@
}
}
- sessionFactory.close();
-
closed = true;
}
catch (HornetQException e)
Modified:
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
===================================================================
---
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-04-23
13:39:19 UTC (rev 9158)
+++
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-04-23
14:44:27 UTC (rev 9159)
@@ -127,7 +127,25 @@
stop();
}
+
+ // https://jira.jboss.org/jira/browse/HORNETQ-315
+ public void testCloseConnectionAfterServerIsShutdown() throws Exception
+ {
+ start();
+
+ HornetQConnectionFactory jbcf = (HornetQConnectionFactory)
HornetQJMSClient.createConnectionFactory(new
TransportConfiguration(NettyConnectorFactory.class.getCanonicalName()));
+ jbcf.setBlockOnDurableSend(true);
+ jbcf.setBlockOnNonDurableSend(true);
+ jbcf.setReconnectAttempts(-1);
+
+ Connection conn = jbcf.createConnection();
+
+ stop();
+
+ conn.close();
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------