Skip to content

Commit cd5cbc3

Browse files
authored
Merge pull request #292 from scalecube/update/msg/metadata/codec
Updated msg and metadata codecs
2 parents 0296a76 + 01bdf76 commit cd5cbc3

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

cluster/src/main/java/io/scalecube/cluster/metadata/GetMetadataResponse.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,27 @@ public void writeExternal(ObjectOutput out) throws IOException {
4242
// member
4343
out.writeObject(member);
4444
// metadata
45-
byte[] bytes = metadata.array();
46-
out.writeInt(bytes.length);
47-
out.write(bytes);
45+
byte[] metadataBytes = metadata.array();
46+
out.writeInt(metadataBytes.length);
47+
out.write(metadataBytes);
4848
}
4949

5050
@Override
5151
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
5252
// member
5353
member = (Member) in.readObject();
5454
// metadata
55-
int size = in.readInt();
56-
byte[] bytes = new byte[size];
57-
in.read(bytes);
58-
metadata = ByteBuffer.wrap(bytes);
55+
int metadataSize = in.readInt();
56+
byte[] metadataBytes = new byte[metadataSize];
57+
in.readFully(metadataBytes);
58+
metadata = ByteBuffer.wrap(metadataBytes);
5959
}
6060

6161
@Override
6262
public String toString() {
6363
return new StringJoiner(", ", GetMetadataResponse.class.getSimpleName() + "[", "]")
6464
.add("member=" + member)
65-
.add("metadata=" + metadata.remaining())
65+
.add("metadata(b=" + metadata.remaining() + ")")
6666
.toString();
6767
}
6868
}

transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/JdkMessageCodec.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ public class JdkMessageCodec implements MessageCodec {
1111
@Override
1212
public Message deserialize(InputStream is) throws IOException, ClassNotFoundException {
1313
Message message = new Message();
14-
try (ObjectInputStream inputStream = new ObjectInputStream(is)) {
15-
message.readExternal(inputStream);
16-
return message;
14+
try (ObjectInputStream ois = new ObjectInputStream(is)) {
15+
message.readExternal(ois);
1716
}
17+
return message;
1818
}
1919

2020
@Override
2121
public void serialize(Message message, OutputStream os) throws IOException {
22-
try (ObjectOutputStream outputStream = new ObjectOutputStream(os)) {
23-
message.writeExternal(outputStream);
24-
outputStream.flush();
22+
try (ObjectOutputStream oos = new ObjectOutputStream(os)) {
23+
message.writeExternal(oos);
24+
oos.flush();
2525
}
2626
}
2727
}

0 commit comments

Comments
 (0)