You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ed...@apache.org on 2008/07/22 08:56:36 UTC
svn commit: r678658 - in
/mina/trunk/example/src/main/java/org/apache/mina/example/proxy:
AbstractProxyIoHandler.java ClientToProxyIoHandler.java
Author: edeoliveira
Date: Mon Jul 21 23:56:35 2008
New Revision: 678658
URL: http://svn.apache.org/viewvc?rev=678658&view=rev
Log:
Fix for DIRMINA-587
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?rev=678658&r1=678657&r2=678658&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Mon Jul 21 23:56:35 2008
@@ -38,6 +38,7 @@
*/
public abstract class AbstractProxyIoHandler extends IoHandlerAdapter {
private static final Charset CHARSET = Charset.forName("iso8859-1");
+ public static final String OTHER_IO_SESSION = AbstractProxyIoHandler.class.getName()+".OtherIoSession";
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -48,10 +49,11 @@
@Override
public void sessionClosed(IoSession session) throws Exception {
- if (session.getAttribute( "" ) != null) {
- ((IoSession) session.getAttribute("")).setAttribute("", null);
- ((IoSession) session.getAttribute("")).closeOnFlush();
- session.setAttribute("", null);
+ if (session.getAttribute( OTHER_IO_SESSION ) != null) {
+ IoSession sess = (IoSession) session.getAttribute(OTHER_IO_SESSION);
+ sess.setAttribute(OTHER_IO_SESSION, null);
+ sess.closeOnFlush();
+ session.setAttribute(OTHER_IO_SESSION, null);
}
}
@@ -63,7 +65,7 @@
rb.mark();
wb.put(rb);
wb.flip();
- ((IoSession) session.getAttribute("")).write(wb);
+ ((IoSession) session.getAttribute(OTHER_IO_SESSION)).write(wb);
rb.reset();
logger.info(rb.getString(CHARSET.newDecoder()));
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java?rev=678658&r1=678657&r2=678658&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java Mon Jul 21 23:56:35 2008
@@ -55,8 +55,8 @@
connector.connect(remoteAddress).addListener(new IoFutureListener<ConnectFuture>() {
public void operationComplete(ConnectFuture future) {
try {
- future.getSession().setAttribute(session);
- session.setAttribute(future.getSession());
+ future.getSession().setAttribute(OTHER_IO_SESSION, session);
+ session.setAttribute(OTHER_IO_SESSION, future.getSession());
future.getSession().setTrafficMask(TrafficMask.ALL);
} catch (RuntimeIoException e) {
// Connect failed