Author: jmesnil
Date: 2008-02-15 09:31:29 -0500 (Fri, 15 Feb 2008)
New Revision: 3723
Modified:
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java
Log:
* added boolean closeSessionOnExceptionCaught to MinaHandler constructor
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-02-14 22:39:38 UTC (rev 3722)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-02-15 14:31:29 UTC (rev 3723)
@@ -93,7 +93,7 @@
configuration.getKeepAliveTimeout(), this);
addExecutorFilter(filterChain);
- connector.setHandler(new MinaHandler(PacketDispatcher.client, this));
+ connector.setHandler(new MinaHandler(PacketDispatcher.client, this, false));
connector.getSessionConfig().setKeepAlive(true);
connector.getSessionConfig().setReuseAddress(true);
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-02-14 22:39:38 UTC (rev 3722)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-02-15 14:31:29 UTC (rev 3723)
@@ -36,14 +36,17 @@
private FailureNotifier failureNotifier;
+ private boolean closeSessionOnExceptionCaught;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public MinaHandler(PacketDispatcher dispatcher, FailureNotifier failureNotifier)
+ public MinaHandler(PacketDispatcher dispatcher, FailureNotifier failureNotifier, boolean closeSessionOnExceptionCaught)
{
this.dispatcher = dispatcher;
this.failureNotifier = failureNotifier;
+ this.closeSessionOnExceptionCaught = closeSessionOnExceptionCaught;
}
// Public --------------------------------------------------------
@@ -63,9 +66,7 @@
re.initCause(cause);
failureNotifier.fireFailure(re);
}
- // FIXME ugly way to know we're on the server side
- // close session only on the server side
- if (dispatcher != PacketDispatcher.client)
+ if (closeSessionOnExceptionCaught)
{
session.close();
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-02-14 22:39:38 UTC (rev 3722)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-02-15 14:31:29 UTC (rev 3723)
@@ -136,7 +136,7 @@
acceptor.getSessionConfig().setKeepAlive(true);
acceptor.setDisconnectOnUnbind(false);
- acceptor.setHandler(new MinaHandler(dispatcher, this));
+ acceptor.setHandler(new MinaHandler(dispatcher, this, true));
acceptor.bind();
acceptorListener = new MinaSessionListener();
acceptor.addListener(acceptorListener);
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java 2008-02-14 22:39:38 UTC (rev 3722)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java 2008-02-15 14:31:29 UTC (rev 3723)
@@ -73,7 +73,7 @@
@Override
protected void setUp() throws Exception
{
- handler = new MinaHandler(PacketDispatcher.client, null);
+ handler = new MinaHandler(PacketDispatcher.client, null, true);
packetHandler = new TestPacketHandler();
PacketDispatcher.client.register(packetHandler);