[infinispan-commits] Infinispan SVN: r1668 - in trunk/server: core/src/main/scala/org/infinispan/server/core/transport and 3 other directories.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-04-07 09:44:35 -0400 (Wed, 07 Apr 2010)
New Revision: 1668

Modified:
   trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala
   trunk/server/core/src/main/scala/org/infinispan/server/core/transport/Decoder.scala
   trunk/server/core/src/main/scala/org/infinispan/server/core/transport/netty/DecoderAdapter.scala
   trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala
   trunk/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala
Log:
[ISPN-393] (Override decodeLast instead of checking readableBytes) Fixed.

Modified: trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala
===================================================================
--- trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala	2010-04-07 10:50:40 UTC (rev 1667)
+++ trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolDecoder.scala	2010-04-07 13:44:35 UTC (rev 1668)
@@ -28,10 +28,6 @@
    private val versionCounter = new AtomicInteger
 
    override def decode(ctx: ChannelHandlerContext, buffer: ChannelBuffer): AnyRef = {
-      if (buffer.readableBytes < 1) {
-         trace("No bytes to decode")
-         return null
-      }
       val header = readHeader(buffer)
       if (header == null) return null // Something went wrong reading the header, so get more bytes 
       try {
@@ -61,6 +57,8 @@
       }
    }
 
+   def decodeLast(ctx: ChannelHandlerContext, buffer: ChannelBuffer): AnyRef = null // no-op
+
    private def writeResponse(ch: Channel, response: AnyRef) {
       if (response != null) {
          response match {

Modified: trunk/server/core/src/main/scala/org/infinispan/server/core/transport/Decoder.scala
===================================================================
--- trunk/server/core/src/main/scala/org/infinispan/server/core/transport/Decoder.scala	2010-04-07 10:50:40 UTC (rev 1667)
+++ trunk/server/core/src/main/scala/org/infinispan/server/core/transport/Decoder.scala	2010-04-07 13:44:35 UTC (rev 1668)
@@ -11,4 +11,5 @@
    
    def exceptionCaught(ctx: ChannelHandlerContext, e: ExceptionEvent)
 
+   def decodeLast(ctx: ChannelHandlerContext, buffer: ChannelBuffer): AnyRef
 }
\ No newline at end of file

Modified: trunk/server/core/src/main/scala/org/infinispan/server/core/transport/netty/DecoderAdapter.scala
===================================================================
--- trunk/server/core/src/main/scala/org/infinispan/server/core/transport/netty/DecoderAdapter.scala	2010-04-07 10:50:40 UTC (rev 1667)
+++ trunk/server/core/src/main/scala/org/infinispan/server/core/transport/netty/DecoderAdapter.scala	2010-04-07 13:44:35 UTC (rev 1668)
@@ -4,7 +4,6 @@
 import org.jboss.netty.channel.{ExceptionEvent => NettyExceptionEvent, ChannelHandlerContext => NettyChannelHandlerContext, Channel => NettyChannel}
 import org.jboss.netty.buffer.{ChannelBuffer => NettyChannelBuffer}
 import org.infinispan.server.core.transport._
-import org.infinispan.server.core.Logging;
 
 /**
  * // TODO: Document this
@@ -15,13 +14,16 @@
 
    override def decode(nCtx: NettyChannelHandlerContext, channel: NettyChannel,
                        nBuffer: NettyChannelBuffer, passedState: NoState): AnyRef = {
-      val ctx = new ChannelHandlerContextAdapter(nCtx);
-      val buffer = new ChannelBufferAdapter(nBuffer);
-      decoder.decode(ctx, buffer);
+      decoder.decode(new ChannelHandlerContextAdapter(nCtx), new ChannelBufferAdapter(nBuffer))
    }
 
    override def exceptionCaught(ctx: NettyChannelHandlerContext, e: NettyExceptionEvent) {
       decoder.exceptionCaught(new ChannelHandlerContextAdapter(ctx), new ExceptionEventAdapter(e));
    }
 
+   override def decodeLast(nCtx: NettyChannelHandlerContext, channel: NettyChannel,
+                  nBuffer: NettyChannelBuffer, passedState: NoState): AnyRef = {
+      decoder.decodeLast(new ChannelHandlerContextAdapter(nCtx), new ChannelBufferAdapter(nBuffer));
+   }
+
 }
\ No newline at end of file

Modified: trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala
===================================================================
--- trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala	2010-04-07 10:50:40 UTC (rev 1667)
+++ trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/test/HotRodClient.scala	2010-04-07 13:44:35 UTC (rev 1668)
@@ -250,10 +250,6 @@
    override def decode(ctx: ChannelHandlerContext, ch: Channel, buffer: ChannelBuffer, state: NoState): Object = {
       trace("Decode response from server")
       val buf = new ChannelBufferAdapter(buffer)
-      if (buf.readableBytes < 1) {
-         trace("No bytes to decode")
-         return null
-      }
       val magic = buf.readUnsignedByte
       val id = buf.readUnsignedLong
       val opCode = OperationResponse.apply(buf.readUnsignedByte)

Modified: trunk/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala
===================================================================
--- trunk/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala	2010-04-07 10:50:40 UTC (rev 1667)
+++ trunk/server/memcached/src/main/scala/org/infinispan/server/memcached/TextProtocolUtil.scala	2010-04-07 13:44:35 UTC (rev 1668)
@@ -24,13 +24,7 @@
    final val CR = 13
    final val LF = 10
 
-   // TODO: maybe convert to recursive
-   def readElement(buffer: ChannelBuffer): String = {
-      if (buffer.readableBytes > 0)
-         readElement(buffer, new StringBuilder())
-      else
-         ""
-   }
+   def readElement(buffer: ChannelBuffer): String = readElement(buffer, new StringBuilder())
 
    private def readElement(buffer: ChannelBuffer, sb: StringBuilder): String = {
       var next = buffer.readByte