You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/01/21 17:06:24 UTC

[1/2] git commit: ACCUMULO-1998 fix warning about an unclosed resource.

Updated Branches:
  refs/heads/master 69f0bcde2 -> 7ecb50a97


ACCUMULO-1998 fix warning about an unclosed resource.

Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8cfdc1ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8cfdc1ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8cfdc1ff

Branch: refs/heads/master
Commit: 8cfdc1ffc4413f0712f7ecac1ba05f682e96d249
Parents: 5aec586
Author: Eric Newton <er...@gmail.com>
Authored: Tue Jan 21 11:05:39 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Jan 21 11:05:39 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/security/crypto/BlockedIOStreamTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8cfdc1ff/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 6fb52dd..b344fc3 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -112,7 +112,7 @@ public class BlockedIOStreamTest {
     blockOut.write(filler);
     blockOut.flush();
     
-    baos.close();
+    blockOut.close();
     assertEquals(16*8, baos.toByteArray().length);
   }
 }


[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ecb50a9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7ecb50a9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7ecb50a9

Branch: refs/heads/master
Commit: 7ecb50a97f02988558d4c7e5f8355a94b27a4b59
Parents: 69f0bcd 8cfdc1f
Author: Eric Newton <er...@gmail.com>
Authored: Tue Jan 21 11:06:23 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Jan 21 11:06:23 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/security/crypto/BlockedIOStreamTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------