From 6b8c3301951a5c7110bf4069af2a1e2eae4aa8bc Mon Sep 17 00:00:00 2001 From: Samuel Carlsson Date: Wed, 19 Mar 2014 17:36:53 +0100 Subject: [PATCH] Fixing a bug where strings where sometimes not read completely during sync. Removing some IntellJ warnings. --- src/se/vidstige/jadb/SyncTransport.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/se/vidstige/jadb/SyncTransport.java b/src/se/vidstige/jadb/SyncTransport.java index 34639e7..4e9a776 100644 --- a/src/se/vidstige/jadb/SyncTransport.java +++ b/src/se/vidstige/jadb/SyncTransport.java @@ -29,7 +29,7 @@ class SyncTransport { private String readString(int length) throws IOException { byte[] buffer = new byte[length]; - input.read(buffer); + input.readFully(buffer); return new String(buffer, Charset.forName("utf-8")); } @@ -38,10 +38,10 @@ class SyncTransport { int mode = readInt(); int size = readInt(); int time = readInt(); - int nameLenght = readInt(); - String name = readString(nameLenght); + int nameLength = readInt(); + String name = readString(nameLength); - if ("DENT".equals(id) == false) return RemoteFile.DONE; + if (!"DENT".equals(id)) return RemoteFile.DONE; return new RemoteFile(id, name, mode, size, time); } }