ACCUMULO-3228 fix possible resource leaks
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46d45774 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46d45774 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46d45774 Branch: refs/heads/master Commit: 46d45774cfa789ce5c3fb524c8c040bc0a0557f4 Parents: 1fcb96f f55d0bf Author: Eric C. Newton <[email protected]> Authored: Fri Oct 10 18:54:35 2014 -0400 Committer: Eric C. Newton <[email protected]> Committed: Fri Oct 10 18:54:35 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/file/rfile/RFile.java | 45 ++++++++++---------- .../minicluster/MiniAccumuloRunner.java | 4 +- .../apache/accumulo/test/scalability/Run.java | 7 ++- 3 files changed, 30 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/46d45774/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/46d45774/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java ---------------------------------------------------------------------- diff --cc minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java index 12ac2f6,e261faa..6b618e3 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java @@@ -219,9 -207,8 +219,9 @@@ public class MiniAccumuloRunner printInfo(accumulo, shutdownPort); // start a socket on the shutdown port and block- anything connected to this port will activate the shutdown - ServerSocket shutdownServer = new ServerSocket(shutdownPort); - shutdownServer.accept().close(); + try (ServerSocket shutdownServer = new ServerSocket(shutdownPort)) { - shutdownServer.accept(); ++ shutdownServer.accept().close(); + } System.exit(0); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/46d45774/test/src/main/java/org/apache/accumulo/test/scalability/Run.java ----------------------------------------------------------------------
