[infinispan-commits] Infinispan SVN: r1597 - in trunk/server: core/src/main/java/org/infinispan/server/core/transport/netty and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-03-11 04:20:13 -0500 (Thu, 11 Mar 2010)
New Revision: 1597

Modified:
   trunk/server/core/src/main/java/org/infinispan/server/core/transport/ChannelBuffer.java
   trunk/server/core/src/main/java/org/infinispan/server/core/transport/netty/NettyChannelBuffer.java
   trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/ClusterTest.scala
Log:
[ISPN-171] (Build a server module based on the HotRod protocol) Forgot to commit API changes in ChannelBuffer abstraction. Minor tweak to ClusterTest to avoid a rather annoying issue with TestNG that thinks that setters/getters for private fields are test methods.


Modified: trunk/server/core/src/main/java/org/infinispan/server/core/transport/ChannelBuffer.java
===================================================================
--- trunk/server/core/src/main/java/org/infinispan/server/core/transport/ChannelBuffer.java	2010-03-11 08:56:33 UTC (rev 1596)
+++ trunk/server/core/src/main/java/org/infinispan/server/core/transport/ChannelBuffer.java	2010-03-11 09:20:13 UTC (rev 1597)
@@ -55,6 +55,11 @@
    void writeUnsignedLong(long l);
    int writerIndex();
 
+   /**
+    * Writes the length of the String followed by the String itself. This methods expects String not to be null. 
+    */
+   void writeString(String msg);
+
    Object getUnderlyingChannelBuffer();
 
 }

Modified: trunk/server/core/src/main/java/org/infinispan/server/core/transport/netty/NettyChannelBuffer.java
===================================================================
--- trunk/server/core/src/main/java/org/infinispan/server/core/transport/netty/NettyChannelBuffer.java	2010-03-11 08:56:33 UTC (rev 1596)
+++ trunk/server/core/src/main/java/org/infinispan/server/core/transport/netty/NettyChannelBuffer.java	2010-03-11 09:20:13 UTC (rev 1597)
@@ -274,7 +274,7 @@
 
    @Override
    public String readString() {
-      String ret = null;
+      String ret;
       try {
          ret = new String(readRangedBytes(), "UTF8");
       } catch (UnsupportedEncodingException e) {
@@ -283,6 +283,9 @@
       return ret;
    }
 
+   public void writeString(String msg) {
+      writeRangedBytes(msg.getBytes());
+   }
 
    //
 //   @Override

Modified: trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/ClusterTest.scala
===================================================================
--- trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/ClusterTest.scala	2010-03-11 08:56:33 UTC (rev 1596)
+++ trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/ClusterTest.scala	2010-03-11 09:20:13 UTC (rev 1597)
@@ -18,8 +18,8 @@
 @Test(groups = Array("functional"), testName = "server.hotrod.ClusterTest")
 class ClusterTest extends MultipleCacheManagersTest with Utils with Client {
    private val cacheName = "hotRodReplSync"
-   private var servers: List[HotRodServer] = List()
-   private var channels: List[Channel] = List()
+   private[this] var servers: List[HotRodServer] = List()
+   private[this] var channels: List[Channel] = List()
 
    @Test(enabled=false) // Disable explicitly to avoid TestNG thinking this is a test!!
    override def createCacheManagers {