You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/10/13 12:14:06 UTC
svn commit: r704003 - in /directory/shared/trunk: asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java pom.xml

Author: pamarcelot
Date: Mon Oct 13 03:14:06 2008
New Revision: 704003

URL: http://svn.apache.org/viewvc?rev=704003&view=rev
Log:
Rollback of Emmanuel's commit (#703486 'First version with MINA 2.0.0-M3').

Modified:
    directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java
    directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java
    directory/shared/trunk/pom.xml

Modified: directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java?rev=704003&r1=704002&r2=704003&view=diff
==============================================================================
--- directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java (original)
+++ directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java Mon Oct 13 03:14:06 2008
@@ -22,8 +22,8 @@
 
 import org.apache.directory.shared.asn1.codec.stateful.DecoderCallback;
 import org.apache.directory.shared.asn1.codec.stateful.StatefulDecoder;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolDecoderAdapter;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
 
@@ -47,7 +47,7 @@
     }
 
 
-    public void decode( IoSession session, IoBuffer in, ProtocolDecoderOutput out ) throws DecoderException
+    public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws DecoderException
     {
         callback.decOut = out;
         decoder.decode( in.buf() );

Modified: directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java?rev=704003&r1=704002&r2=704003&view=diff
==============================================================================
--- directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java (original)
+++ directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java Mon Oct 13 03:14:06 2008
@@ -26,8 +26,8 @@
 
 import org.apache.directory.shared.asn1.codec.stateful.EncoderCallback;
 import org.apache.directory.shared.asn1.codec.stateful.StatefulEncoder;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolEncoder;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
 
@@ -73,7 +73,8 @@
             if( encoded instanceof java.nio.ByteBuffer )
             {
                 java.nio.ByteBuffer buf = ( java.nio.ByteBuffer ) encoded;
-                IoBuffer wrappedBuf = IoBuffer.wrap( buf );
+                ByteBuffer wrappedBuf = ByteBuffer.wrap( buf );
+                wrappedBuf.acquire();  // acquire once more to prvent leak
                 encOut.write( wrappedBuf );
             }
             else if( encoded instanceof Object[] )

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=704003&r1=704002&r2=704003&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Mon Oct 13 03:14:06 2008
@@ -98,7 +98,7 @@
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
-        <version>2.0.0-M4-SNAPSHOT</version>
+        <version>1.1.7</version>
       </dependency>
     </dependencies>
   </dependencyManagement>