Merge branch 'release/0.12.2-RC2'

rsocket · Apr 18, 2019 · 119d578 · 119d578
2 parents 32bd149 + 3694844
commit 119d578
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -11,4 +11,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=0.12.2-RC1
+version=0.12.2-RC2
diff --git a/rsocket-core/src/main/java/io/rsocket/frame/DataAndMetadataFlyweight.java b/rsocket-core/src/main/java/io/rsocket/frame/DataAndMetadataFlyweight.java
@@ -3,7 +3,6 @@
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
-import io.rsocket.buffer.TupleByteBuf;
 
 class DataAndMetadataFlyweight {
   public static final int FRAME_LENGTH_MASK = 0xFFFFFF;
@@ -33,20 +32,19 @@ private static int decodeLength(final ByteBuf byteBuf) {
 
   static ByteBuf encodeOnlyMetadata(
       ByteBufAllocator allocator, final ByteBuf header, ByteBuf metadata) {
-    return TupleByteBuf.of(allocator, header, metadata);
+    return allocator.compositeBuffer().addComponents(true, header, metadata);
   }
 
   static ByteBuf encodeOnlyData(ByteBufAllocator allocator, final ByteBuf header, ByteBuf data) {
-    return TupleByteBuf.of(allocator, header, data);
+    return allocator.compositeBuffer().addComponents(true, header, data);
   }
 
   static ByteBuf encode(
       ByteBufAllocator allocator, final ByteBuf header, ByteBuf metadata, ByteBuf data) {
 
     int length = metadata.readableBytes();
     encodeLength(header, length);
-
-    return TupleByteBuf.of(allocator, header, metadata, data);
+    return allocator.compositeBuffer().addComponents(true, header, metadata, data);
   }
 
   static ByteBuf metadataWithoutMarking(ByteBuf byteBuf, boolean hasMetadata) {

diff --git a/rsocket-core/src/main/java/io/rsocket/frame/FrameLengthFlyweight.java b/rsocket-core/src/main/java/io/rsocket/frame/FrameLengthFlyweight.java
@@ -2,7 +2,6 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
-import io.rsocket.buffer.TupleByteBuf;
 
 /**
  * Some transports like TCP aren't framed, and require a length. This is used by DuplexConnections
@@ -35,7 +34,7 @@ private static int decodeLength(final ByteBuf byteBuf) {
   public static ByteBuf encode(ByteBufAllocator allocator, int length, ByteBuf frame) {
     ByteBuf buffer = allocator.buffer();
     encodeLength(buffer, length);
-    return TupleByteBuf.of(allocator, buffer, frame);
+    return allocator.compositeBuffer().addComponents(true, buffer, frame);
   }
 
   public static int length(ByteBuf byteBuf) {