Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC4CD720D for ; Fri, 2 Sep 2011 14:18:34 +0000 (UTC) Received: (qmail 84020 invoked by uid 500); 2 Sep 2011 14:18:34 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 83926 invoked by uid 500); 2 Sep 2011 14:18:34 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 83917 invoked by uid 99); 2 Sep 2011 14:18:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 14:18:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 14:18:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F0E83238897A; Fri, 2 Sep 2011 14:18:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164542 - in /jackrabbit/sandbox/microkernel/src: main/java/org/apache/jackrabbit/mk/api/ main/java/org/apache/jackrabbit/mk/blobs/ test/java/org/apache/jackrabbit/mk/blobs/ Date: Fri, 02 Sep 2011 14:18:08 -0000 To: commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110902141808.F0E83238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Fri Sep 2 14:18:00 2011 New Revision: 1164542 URL: http://svn.apache.org/viewvc?rev=1164542&view=rev Log: Blob store: document and test that the stream is closed. Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1164542&r1=1164541&r2=1164542&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java (original) +++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java Fri Sep 2 14:18:00 2011 @@ -298,9 +298,11 @@ public interface MicroKernel { /** * Stores the content of the given stream and returns an associated * identifier for later retrieval. - *

+ *

* If identical stream content has been stored previously, then the existing * identifier will be returned instead of storing a redundant copy. + *

+ * The stream is closed by this method. * * @param in InputStream providing the blob content * @return blob identifier associated with the given content Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java?rev=1164542&r1=1164541&r2=1164542&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java (original) +++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java Fri Sep 2 14:18:00 2011 @@ -138,6 +138,7 @@ public abstract class AbstractBlobStore idStream.reset(); convertBlobToId(new ByteArrayInputStream(idBlock), idStream, level + 1, totalLength); } + in.close(); } protected abstract void storeBlock(byte[] blockId, int level, byte[] data) throws Exception; Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java?rev=1164542&r1=1164541&r2=1164542&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java (original) +++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java Fri Sep 2 14:18:00 2011 @@ -54,10 +54,9 @@ public class FileBlobStore extends Abstr } private File getFile(byte[] blockId) { - String id = StringUtils.convertBytesToHex(blockId) + ".dat"; - File dir = new File(baseDir, id.substring(0, 2)); - File f = new File(dir, id); - return f; + String id = StringUtils.convertBytesToHex(blockId); + String sub = id.substring(id.length() - 2); + return new File(new File(baseDir, sub), id + ".dat"); } @Override Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java?rev=1164542&r1=1164541&r2=1164542&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java (original) +++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java Fri Sep 2 14:18:00 2011 @@ -27,9 +27,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.sql.Connection; import java.util.ArrayList; import java.util.Random; +import java.util.concurrent.atomic.AtomicBoolean; /** * Tests the DbBlobStore implementation. @@ -70,6 +72,20 @@ public class DbBlobStoreTest extends Tes assertEquals(0, store.getBlobLength("")); } + public void testCloseStream() throws Exception { + final AtomicBoolean closed = new AtomicBoolean(); + InputStream in = new InputStream() { + public void close() { + closed.set(true); + } + public int read() throws IOException { + return -1; + } + }; + store.writeBlob(in); + assertTrue(closed.get()); + } + public void testIllegalIdentifier() throws Exception { byte[] data = new byte[1]; try {