[jboss-cvs] JBoss Messaging SVN: r4856 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/netty and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: trustin
Date: 2008-08-21 03:08:18 -0400 (Thu, 21 Aug 2008)
New Revision: 4856

Modified:
   trunk/.classpath
   trunk/build-messaging.xml
   trunk/build-thirdparty.xml
   trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java
Log:
Upgraded to Netty 3.0.0.CR2

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2008-08-21 06:51:11 UTC (rev 4855)
+++ trunk/.classpath	2008-08-21 07:08:18 UTC (rev 4856)
@@ -63,6 +63,6 @@
 	<classpathentry kind="lib" path="thirdparty/cglib/lib/cglib.jar"/>
 	<classpathentry kind="lib" path="tests/tmpfiles"/>
 	<classpathentry kind="lib" path="thirdparty/apache-mina/lib/mina-core-2.0.0-M3-20080730.120633-1.jar" sourcepath="thirdparty/apache-mina/lib/mina-core-2.0.0-M3-20080730.120633-1-sources.jar"/>
-	<classpathentry kind="lib" path="thirdparty/netty/lib/netty-3.0.0.CR1.jar" sourcepath="thirdparty/netty/lib/netty-3.0.0.CR1-sources.jar"/>
+	<classpathentry kind="lib" path="thirdparty/netty/lib/netty-3.0.0.CR2.jar" sourcepath="thirdparty/netty/lib/netty-3.0.0.CR2-sources.jar"/>
 	<classpathentry kind="output" path="eclipse-output"/>
 </classpath>

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-08-21 06:51:11 UTC (rev 4855)
+++ trunk/build-messaging.xml	2008-08-21 07:08:18 UTC (rev 4856)
@@ -493,7 +493,7 @@
             <include name="mina-core-2.0.0-M3-20080730.120633-1.jar"/>
          </fileset>
          <fileset dir="${netty.lib}">
-            <include name="netty-3.0.0.CR1.jar"/>
+            <include name="netty-3.0.0.CR2.jar"/>
          </fileset>
          <fileset dir="${slf4j.api.lib}">
             <include name="slf4j-api-1.4.3.jar"/>

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2008-08-21 06:51:11 UTC (rev 4855)
+++ trunk/build-thirdparty.xml	2008-08-21 07:08:18 UTC (rev 4856)
@@ -98,7 +98,7 @@
       <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
       <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
       <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
-      <componentref name="netty" version="3.0.0.CR1"/>
+      <componentref name="netty" version="3.0.0.CR2"/>
       <componentref name="apache-mina" version="2.0.0-M3-20080730.120633-1"/>
       <componentref name="slf4j/log4j" version="1.4.3"/>
       <componentref name="jpa-api" version="1.0.0.GA"/>

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java	2008-08-21 06:51:11 UTC (rev 4855)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/ChannelBufferWrapper.java	2008-08-21 07:08:18 UTC (rev 4856)
@@ -58,13 +58,7 @@
 
    public ChannelBufferWrapper(final int size)
    {
-      if (size == 0) {
-         // FIXME: This block should go away once Netty 3.0.0.CR2 is
-         //        released.
-         buffer = ChannelBuffer.EMPTY_BUFFER;
-      } else {
-         buffer = dynamicBuffer(size);
-      }
+      buffer = dynamicBuffer(size);
       buffer.writerIndex(buffer.capacity());
    }