Return-Path: 
 <commits-return-4355-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 64078 invoked from network); 21 Apr 2005 15:43:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 21 Apr 2005 15:43:20 -0000
Received: (qmail 1681 invoked by uid 500); 21 Apr 2005 15:43:36 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 1649 invoked by uid 500); 21 Apr 2005 15:43:35 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 1633 invoked by uid 99); 21 Apr 2005 15:43:35 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 21 Apr 2005 08:43:35 -0700
Received: (qmail 64069 invoked by uid 65534); 21 Apr 2005 15:43:18 -0000
Message-ID: <20050421154318.64068.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r164074 - in
 /directory/network/trunk/src/java/org/apache/mina:
 common/ByteBuffer.java common/Session.java protocol/io/IoAdapter.java
 protocol/io/IoProtocolAcceptor.java protocol/vmpipe/VmPipeSession.java
 util/BaseSession.java
Date: Thu, 21 Apr 2005 15:43:17 -0000
To: commits@directory.apache.org
From: trustin@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: trustin
Date: Thu Apr 21 08:43:16 2005
New Revision: 164074

URL: http://svn.apache.org/viewcvs?rev=3D164074&view=3Drev
Log:
* Added Session.removeAttribute()
* IoAdapter doesn't store ProtocolSession in attachment anymore.
* Fixed: VmPipeSession doesn't call both SessionInitializer.

Modified:
    directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java
    directory/network/trunk/src/java/org/apache/mina/common/Session.java
    directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.=
java
    directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocol=
Acceptor.java
    directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipe=
Session.java
    directory/network/trunk/src/java/org/apache/mina/util/BaseSession.java

Modified: directory/network/trunk/src/java/org/apache/mina/common/ByteBuffe=
r=2Ejava
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apa=
che/mina/common/ByteBuffer.java?rev=3D164074&r1=3D164073&r2=3D164074&view=
=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java=
 (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java=
 Thu Apr 21 08:43:16 2005
@@ -32,6 +32,9 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
=20
+import org.apache.mina.io.IoHandler;
+import org.apache.mina.io.IoSession;
+import org.apache.mina.protocol.ProtocolEncoderOutput;
 import org.apache.mina.util.Stack;
=20
 /**

Modified: directory/network/trunk/src/java/org/apache/mina/common/Session.j=
ava
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apa=
che/mina/common/Session.java?rev=3D164074&r1=3D164073&r2=3D164074&view=3Ddi=
ff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/network/trunk/src/java/org/apache/mina/common/Session.java (o=
riginal)
+++ directory/network/trunk/src/java/org/apache/mina/common/Session.java Th=
u Apr 21 08:43:16 2005
@@ -72,6 +72,13 @@
     Object setAttribute( String key, Object value );
    =20
     /**
+     * Removes a user-defined attribute with the specified key.
+     *=20
+     * @return The old value of the attribute.  <tt>null</tt> if not found=
.
+     */
+    Object removeAttribute( String key );
+   =20
+    /**
      * Returns the set of keys of all user-defined attributes.
      */
     Set getAttributeKeys();

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAd=
apter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apa=
che/mina/protocol/io/IoAdapter.java?rev=3D164074&r1=3D164073&r2=3D164074&vi=
ew=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.=
java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.=
java Thu Apr 21 08:43:16 2005
@@ -53,6 +53,8 @@
  */
 public class IoAdapter
 {
+    private static final String KEY =3D "IoAdapter.ProtocolSession";
+
     private final IoProtocolFilterChain filters =3D new IoProtocolFilterCh=
ain();
=20
     IoAdapter()
@@ -162,14 +164,13 @@
         {
             if( marker =3D=3D null )
                 return;
-            filters.messageSent(=20
-                    ( ProtocolSession ) session.getAttachment(), marker );
+            filters.messageSent( getProtocolSession( session ),
+                                 marker );
         }
=20
         void doWrite( IoSession session )
         {
-            ProtocolSessionImpl psession =3D ( ProtocolSessionImpl ) sessi=
on
-                    .getAttachment();
+            ProtocolSessionImpl psession =3D getProtocolSession( session )=
;
             ProtocolEncoder encoder =3D psession.encoder;
             Queue writeQueue =3D psession.writeQueue;
=20
@@ -210,18 +211,18 @@
=20
         private ProtocolSessionImpl getProtocolSession( IoSession session =
)
         {
-            ProtocolSessionImpl psession =3D ( ProtocolSessionImpl ) sessi=
on
-                    .getAttachment();
+            ProtocolSessionImpl psession =3D
+                ( ProtocolSessionImpl ) session.getAttribute( KEY );
             if( psession =3D=3D null )
             {
                 synchronized( session )
                 {
-                    psession =3D ( ProtocolSessionImpl ) session
-                            .getAttachment();
+                    psession =3D
+                        ( ProtocolSessionImpl ) session.getAttribute( KEY =
);
                     if( psession =3D=3D null )
                     {
                         psession =3D new ProtocolSessionImpl( session, thi=
s );
-                        session.setAttachment( psession );
+                        session.setAttribute( KEY, psession );
                     }
                 }
             }
@@ -295,6 +296,11 @@
         public Object setAttribute( String key, Object value )
         {
             return session.setAttribute( key, value );
+        }
+       =20
+        public Object removeAttribute( String key )
+        {
+            return session.removeAttribute( key );
         }
=20
         public Set getAttributeKeys()

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/io/IoPr=
otocolAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apa=
che/mina/protocol/io/IoProtocolAcceptor.java?rev=3D164074&r1=3D164073&r2=3D=
164074&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocol=
Acceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocol=
Acceptor.java Thu Apr 21 08:43:16 2005
@@ -9,9 +9,11 @@
 import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.SessionInitializer;
 import org.apache.mina.io.IoAcceptor;
+import org.apache.mina.io.IoSession;
 import org.apache.mina.protocol.ProtocolAcceptor;
 import org.apache.mina.protocol.ProtocolHandlerFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
+import org.apache.mina.protocol.ProtocolSession;
=20
 /**
  * A {@link ProtocolAcceptor} which wraps {@link IoAcceptor} to provide

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/=
VmPipeSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apa=
che/mina/protocol/vmpipe/VmPipeSession.java?rev=3D164074&r1=3D164073&r2=3D1=
64074&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipe=
Session.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipe=
Session.java Thu Apr 21 08:43:16 2005
@@ -61,11 +61,9 @@
         remoteSession =3D new VmPipeSession( this, remoteEntry.handler );
         if( remoteEntry.initializer !=3D null )
         {
-            boolean success =3D false;
             try
             {
                 remoteEntry.initializer.initializeSession( remoteSession )=
;
-                success =3D true;
             }
             catch( Throwable t )
             {
@@ -74,6 +72,8 @@
                 e.initCause( t );
                 throw e;
             }
+           =20
+            initializer.initializeSession( this );
         }
=20
         remoteEntry.filters.sessionOpened( remoteSession );

Modified: directory/network/trunk/src/java/org/apache/mina/util/BaseSession=
.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apa=
che/mina/util/BaseSession.java?rev=3D164074&r1=3D164073&r2=3D164074&view=3D=
diff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/network/trunk/src/java/org/apache/mina/util/BaseSession.java =
(original)
+++ directory/network/trunk/src/java/org/apache/mina/util/BaseSession.java =
Thu Apr 21 08:43:16 2005
@@ -79,6 +79,14 @@
             return attributes.put( key, value );
         }
     }
+   =20
+    public Object removeAttribute( String key )
+    {
+        synchronized( attributes )
+        {
+            return attributes.remove( key );
+        }
+    }
=20
     public Set getAttributeKeys() {
         synchronized( attributes )
@@ -86,7 +94,7 @@
             return attributes.keySet();
         }
     }
-
+   =20
     public long getReadBytes()
     {
         return readBytes;