From 01bdf762d78fde1fe82829f336d3dbf828c938fb Mon Sep 17 00:00:00 2001
From: Artem Vysochyn <artem.vysochyn@gmail.com>
Date: Fri, 17 Jan 2020 15:08:01 +0200
Subject: [PATCH] Updated msg and metadata codecs

---
 .../cluster/metadata/GetMetadataResponse.java    | 16 ++++++++--------
 .../cluster/transport/api/JdkMessageCodec.java   | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cluster/src/main/java/io/scalecube/cluster/metadata/GetMetadataResponse.java b/cluster/src/main/java/io/scalecube/cluster/metadata/GetMetadataResponse.java
index 4defbf1b..97454149 100644
--- a/cluster/src/main/java/io/scalecube/cluster/metadata/GetMetadataResponse.java
+++ b/cluster/src/main/java/io/scalecube/cluster/metadata/GetMetadataResponse.java
@@ -42,9 +42,9 @@ public void writeExternal(ObjectOutput out) throws IOException {
     // member
     out.writeObject(member);
     // metadata
-    byte[] bytes = metadata.array();
-    out.writeInt(bytes.length);
-    out.write(bytes);
+    byte[] metadataBytes = metadata.array();
+    out.writeInt(metadataBytes.length);
+    out.write(metadataBytes);
   }
 
   @Override
@@ -52,17 +52,17 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
     // member
     member = (Member) in.readObject();
     // metadata
-    int size = in.readInt();
-    byte[] bytes = new byte[size];
-    in.read(bytes);
-    metadata = ByteBuffer.wrap(bytes);
+    int metadataSize = in.readInt();
+    byte[] metadataBytes = new byte[metadataSize];
+    in.readFully(metadataBytes);
+    metadata = ByteBuffer.wrap(metadataBytes);
   }
 
   @Override
   public String toString() {
     return new StringJoiner(", ", GetMetadataResponse.class.getSimpleName() + "[", "]")
         .add("member=" + member)
-        .add("metadata=" + metadata.remaining())
+        .add("metadata(b=" + metadata.remaining() + ")")
         .toString();
   }
 }
diff --git a/transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/JdkMessageCodec.java b/transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/JdkMessageCodec.java
index 914be118..dc254c18 100644
--- a/transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/JdkMessageCodec.java
+++ b/transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/JdkMessageCodec.java
@@ -11,17 +11,17 @@ public class JdkMessageCodec implements MessageCodec {
   @Override
   public Message deserialize(InputStream is) throws IOException, ClassNotFoundException {
     Message message = new Message();
-    try (ObjectInputStream inputStream = new ObjectInputStream(is)) {
-      message.readExternal(inputStream);
-      return message;
+    try (ObjectInputStream ois = new ObjectInputStream(is)) {
+      message.readExternal(ois);
     }
+    return message;
   }
 
   @Override
   public void serialize(Message message, OutputStream os) throws IOException {
-    try (ObjectOutputStream outputStream = new ObjectOutputStream(os)) {
-      message.writeExternal(outputStream);
-      outputStream.flush();
+    try (ObjectOutputStream oos = new ObjectOutputStream(os)) {
+      message.writeExternal(oos);
+      oos.flush();
     }
   }
 }