Repository: cloudstack Updated Branches: refs/heads/master bd3d8286d -> 6133bda64
Fixed Coverity Issues Reported Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6133bda6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6133bda6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6133bda6 Branch: refs/heads/master Commit: 6133bda6423eabc64525d26f79b78aeeb115854c Parents: bd3d828 Author: Santhosh Edukulla <santhosh.eduku...@gmail.com> Authored: Thu Jul 31 16:36:05 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Thu Jul 31 16:36:05 2014 +0530 ---------------------------------------------------------------------- .../src/main/java/streamer/debug/MockSink.java | 2 +- .../ConsoleProxyResourceHandler.java | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6133bda6/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSink.java ---------------------------------------------------------------------- diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSink.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSink.java index fe038a9..2e1485c 100755 --- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSink.java +++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSink.java @@ -77,7 +77,7 @@ public class MockSink extends BaseElement { Object actualValue = buf.getMetadata(key); if (actualValue == null) throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer in metadata for key \"" + key - + "\".\n Actual metadata value: " + actualValue + ",\n expected value: \"" + expectedValue + "\"."); + + "\".\n Actual metadata value: " + ",\n expected value: \"" + expectedValue + "\"."); if (!expectedValue.equals(actualValue)) throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer in metadata for key \"" + key http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6133bda6/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java index 250abe3..8659120 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyResourceHandler.java @@ -144,18 +144,17 @@ public class ConsoleProxyResourceHandler implements HttpHandler { } private static void responseFileContent(HttpExchange t, File f) throws Exception { - OutputStream os = t.getResponseBody(); - FileInputStream fis = new FileInputStream(f); - while (true) { - byte[] b = new byte[8192]; - int n = fis.read(b); - if (n < 0) { - break; + try(OutputStream os = t.getResponseBody(); + FileInputStream fis = new FileInputStream(f);) { + while (true) { + byte[] b = new byte[8192]; + int n = fis.read(b); + if (n < 0) { + break; + } + os.write(b, 0, n); } - os.write(b, 0, n); } - fis.close(); - os.close(); } private static boolean validatePath(String path) {
