svn commit: r486517 - in /mina/trunk/core/src: main/java/org/apache/mina/filter/codec/serialization/ test/java/org/apache/mina/filter/codec/serialization/

[trustin]

Author: trustin
Date: Tue Dec 12 22:47:01 2006
New Revision: 486517

URL: http://svn.apache.org/viewvc?view=rev&rev=486517
Log:
Merged changes in branches/1.0 (DIRMINA-321)

Added:
    mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/
      - copied from r486512, 
mina/branches/1.0/core/src/test/java/org/apache/mina/filter/codec/serialization/
    
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
      - copied, changed from r486512, 
mina/branches/1.0/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
Modified:
    
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java?view=diff&rev=486517&r1=486516&r2=486517
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java
 Tue Dec 12 22:47:01 2006
@@ -120,7 +120,7 @@
         buf.putInt( objectSize );
         in.readFully( buf.array(), 4, objectSize );
         buf.position( 0 );
-        buf.limit( objectSize );
+        buf.limit( objectSize + 4 );
         
         Object answer = buf.getObject( classLoader );
         buf.release();

Copied: 
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
 (from r486512, 
mina/branches/1.0/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java)
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java?view=diff&rev=486517&p1=mina/branches/1.0/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java&r1=486512&p2=mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java&r2=486517
==============================================================================
--- 
mina/branches/1.0/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
 (original)
+++ 
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
 Tue Dec 12 22:47:01 2006
@@ -31,7 +31,6 @@
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceConfig;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.common.IoSessionConfig;
 import org.apache.mina.common.TransportType;
@@ -108,7 +107,7 @@
     
     private static class MockIoSession extends BaseIoSession
     {
-
+        @Override
         protected void updateTrafficMask()
         {
         }
@@ -143,7 +142,7 @@
             return 0;
         }
 
-        public int getScheduledWriteRequests()
+        public int getScheduledWriteMessages()
         {
             return 0;
         }
@@ -153,16 +152,6 @@
             return null;
         }
 
-        public SocketAddress getServiceAddress()
-        {
-            return null;
-        }
-
-        public IoServiceConfig getServiceConfig()
-        {
-            return null;
-        }
-
         public TransportType getTransportType()
         {
             return null;
@@ -171,7 +160,7 @@
     
     private static class MockProtocolDecoderOutput implements 
ProtocolDecoderOutput
     {
-        private List result = new ArrayList();
+        private List<Object> result = new ArrayList<Object>();
 
         public void flush()
         {