Origional patch

Author: kc7bfi

mina-core/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.4-PSG</version>
   </parent>
 
   <artifactId>mina-core</artifactId>

mina-core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java

@@ -100,6 +100,7 @@ public void mergeAll() {
             }
 
             newBuf.put(buf);
+			buf.free();
         }
 
         // Push the new buffer finally.

mina-core/src/main/java/org/apache/mina/filter/codec/CumulativeProtocolDecoder.java

@@ -165,9 +165,12 @@ public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) th
                 newBuf.put(buf);
                 newBuf.put(in);
                 newBuf.flip();
+				buf.free();
                 buf = newBuf;
 
                 // Update the session attribute.
+				IoBuffer oldBuf = (IoBuffer) session.getAttribute(BUFFER);
+				if (oldBuf != null) oldBuf.free();
                 session.setAttribute(BUFFER, buf);
             }
         } else {
@@ -234,15 +237,18 @@ public void dispose(IoSession session) throws Exception {
     }
 
     private void removeSessionBuffer(IoSession session) {
-        session.removeAttribute(BUFFER);
-    }
+        IoBuffer oldBuf = (IoBuffer) session.removeAttribute(BUFFER);
+ 		if (oldBuf != null) oldBuf.free();
+   }
 
     private void storeRemainingInSession(IoBuffer buf, IoSession session) {
         final IoBuffer remainingBuf = IoBuffer.allocate(buf.capacity()).setAutoExpand(true);
 
         remainingBuf.order(buf.order());
         remainingBuf.put(buf);
 
+		IoBuffer oldBuf = (IoBuffer) session.getAttribute(BUFFER);
+		if (oldBuf != null) oldBuf.free();
         session.setAttribute(BUFFER, remainingBuf);
     }
 

mina-core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java

@@ -281,6 +281,7 @@ public void messageReceived(NextFilter nextFilter, IoSession session, Object mes
                 }
             }
         }
+		in.free();
     }
 
     /**