Changeset 30221

Timestamp:

02/18/08 14:43:02 (9 months ago)

Author:

bstefanescu

Message:

fix for NXP-2072
Do not use jackrabbit input stream directly but wrap it into a custom stream to be able to reset the stream
to read it more than once.

Files:

• org.nuxeo.ecm.core/branches/1.4/nuxeo-core-facade/src/test/java/org/nuxeo/ecm/core/api/TestLocalAPI.java (modified) (3 diffs)
• org.nuxeo.ecm.core/branches/1.4/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRBlob.java (modified) (2 diffs)
• org.nuxeo.ecm.core/branches/1.4/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRBlobInputStream.java (added)

org.nuxeo.ecm.core/branches/1.4/nuxeo-core-facade/src/test/java/org/nuxeo/ecm/core/api/TestLocalAPI.java

@@ -20 +20 @@
-package org.nuxeo.ecm.core.api;
-
+import java.io.File;
+import java.lang.reflect.Array;
-import java.net.URL;
+import java.util.Arrays;
-import java.util.Calendar;
-import java.util.List;
@@ -27 +30 @@
-import org.nuxeo.ecm.core.api.impl.DocumentModelImpl;
-import org.nuxeo.ecm.core.api.impl.VersionModelImpl;
+import org.nuxeo.ecm.core.api.impl.blob.ByteArrayBlob;
+import org.nuxeo.ecm.core.api.impl.blob.FileBlob;
-import org.nuxeo.ecm.core.api.model.DocumentPart;
-import org.nuxeo.ecm.core.api.model.Property;
@@ -328 +333 @@
-    }
-
+    public static byte[] createBytes(int size, byte val) {
+        byte[] bytes = new byte[size];
+        Arrays.fill(bytes, val);
+        return bytes;
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testLazyBlob() throws Exception {
+        DocumentModel root = getRootDocument();
+        DocumentModel doc = new DocumentModelImpl(root.getPathAsString(),
+                "mydoc", "File");
+
+        doc = remote.createDocument(doc);
+        byte[] bytes = createBytes(1024*1024, (byte)24);
+
+        Blob blob = new ByteArrayBlob(bytes);
+        doc.getPart("file").get("content").setValue(blob);
+        doc = remote.saveDocument(doc);
+
+        blob = (Blob)doc.getPart("file").get("content").getValue();
+        assertTrue(Arrays.equals(bytes, blob.getByteArray()));
+
+        // test that reset works
+        blob.getStream().reset();
+
+        blob = (Blob)doc.getPart("file").get("content").getValue();
+        assertTrue(Arrays.equals(bytes, blob.getByteArray()));
+
+    }
+
+
-    // TODO: fix and reenable SF 2007/05/23
-    public void XXXtestProxy() throws Exception {

org.nuxeo.ecm.core/branches/1.4/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRBlob.java

@@ -194 +194 @@
-    }
-
-
+
+
+
+
+
+
-        try {
-            return node.getProperty(DATA).getStream();
@@ -202 +207 @@
-            throw (IOException) (new IOException("could fetch stream").initCause(e));
-        }
+    }
+
+    /**
+     * Do not return the jackrabbit stream directly. Wrap it inside a JCRBlobInputStream to be able to
+     * reset the stream and read it more than once.
+     * <p>
+     * Fix for NXP-2072
+     * @see JCRBlobInputStream
+     * @see NXP-2072
+     */
+    public InputStream getStream() throws IOException {
+        return new JCRBlobInputStream(this);
-    }
-