X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=416d035f8b5925555e421c46ede06e21e85dd231;hb=2afabd9e7b225f80b341063e25188314394c9aef;hp=331164cf2b442dec485bb7a71ebb0d7a0c50dd65;hpb=25e4528153640a2e211e217468f8f5aa01607cf0;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java b/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java
index 331164cf2..416d035f8 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java
@@ -991,16 +991,26 @@ public class JcrUtils {
 
 	/** Writes a {@link Binary} from a byte array */
 	public static void setBinaryAsBytes(Node node, String property, byte[] bytes) {
-		// InputStream in = null;
 		Binary binary = null;
 		try (InputStream in = new ByteArrayInputStream(bytes)) {
-			// in = new ByteArrayInputStream(bytes);
 			binary = node.getSession().getValueFactory().createBinary(in);
 			node.setProperty(property, binary);
 		} catch (Exception e) {
-			throw new ArgeoJcrException("Cannot read binary " + property + " as bytes", e);
+			throw new ArgeoJcrException("Cannot set binary " + property + " as bytes", e);
+		} finally {
+			closeQuietly(binary);
+		}
+	}
+
+	/** Writes a {@link Binary} from a byte array */
+	public static void setBinaryAsBytes(Property prop, byte[] bytes) {
+		Binary binary = null;
+		try (InputStream in = new ByteArrayInputStream(bytes)) {
+			binary = prop.getSession().getValueFactory().createBinary(in);
+			prop.setValue(binary);
+		} catch (RepositoryException | IOException e) {
+			throw new ArgeoJcrException("Cannot set binary " + prop + " as bytes", e);
 		} finally {
-			// IOUtils.closeQuietly(in);
 			closeQuietly(binary);
 		}
 	}
@@ -1298,23 +1308,30 @@ public class JcrUtils {
 		return true;
 	}
 
-	/** Gets access control list for this path, throws exception if not found */
+	/**
+	 * Gets the first available access control list for this path, throws exception
+	 * if not found
+	 */
 	public synchronized static AccessControlList getAccessControlList(AccessControlManager acm, String path)
 			throws RepositoryException {
 		// search for an access control list
 		AccessControlList acl = null;
 		AccessControlPolicyIterator policyIterator = acm.getApplicablePolicies(path);
-		if (policyIterator.hasNext()) {
+		applicablePolicies: if (policyIterator.hasNext()) {
 			while (policyIterator.hasNext()) {
 				AccessControlPolicy acp = policyIterator.nextAccessControlPolicy();
-				if (acp instanceof AccessControlList)
+				if (acp instanceof AccessControlList) {
 					acl = ((AccessControlList) acp);
+					break applicablePolicies;
+				}
 			}
 		} else {
 			AccessControlPolicy[] existingPolicies = acm.getPolicies(path);
-			for (AccessControlPolicy acp : existingPolicies) {
-				if (acp instanceof AccessControlList)
+			existingPolicies: for (AccessControlPolicy acp : existingPolicies) {
+				if (acp instanceof AccessControlList) {
 					acl = ((AccessControlList) acp);
+					break existingPolicies;
+				}
 			}
 		}
 		if (acl != null)
@@ -1487,7 +1504,7 @@ public class JcrUtils {
 				contentNode = fileNode.getNode(Node.JCR_CONTENT);
 			} else {
 				fileNode = folderNode.addNode(fileName, NodeType.NT_FILE);
-				contentNode = fileNode.addNode(Node.JCR_CONTENT, NodeType.NT_RESOURCE);
+				contentNode = fileNode.addNode(Node.JCR_CONTENT, NodeType.NT_UNSTRUCTURED);
 			}
 			binary = contentNode.getSession().getValueFactory().createBinary(in);
 			contentNode.setProperty(Property.JCR_DATA, binary);
@@ -1499,6 +1516,11 @@ public class JcrUtils {
 		}
 	}
 
+	/** Read an an nt:file as an {@link InputStream}. */
+	public static InputStream getFileAsStream(Node fileNode) throws RepositoryException {
+		return fileNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary().getStream();
+	}
+
 	/**
 	 * Computes the checksum of an nt:file.
 	 * 
@@ -1506,14 +1528,11 @@ public class JcrUtils {
 	 */
 	@Deprecated
 	public static String checksumFile(Node fileNode, String algorithm) {
-		Binary data = null;
 		try (InputStream in = fileNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary()
 				.getStream()) {
 			return digest(algorithm, in);
 		} catch (RepositoryException | IOException e) {
 			throw new ArgeoJcrException("Cannot checksum file " + fileNode, e);
-		} finally {
-			closeQuietly(data);
 		}
 	}