From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 29 May 2012 15:12:43 +0000 (+0000)
Subject: Make JcrUtils.get() return null for missing property
X-Git-Tag: argeo-commons-2.1.30~934
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=6f60b61169bed7013fb8195f48bbc7bf8514402f;p=lgpl%2Fargeo-commons.git

Make JcrUtils.get() return null for missing property

git-svn-id: https://svn.argeo.org/commons/trunk@5317 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
index 4c0cbf39d..e7b3656cf 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -307,9 +307,14 @@ public class JcrUtils implements ArgeoJcrConstants {
 	 * PROPERTIES
 	 */
 
-	/** Concisely get the string value of a property */
+	/**
+	 * Concisely get the string value of a property or null if this node doesn't
+	 * have this property
+	 */
 	public static String get(Node node, String propertyName) {
 		try {
+			if (!node.hasProperty(propertyName))
+				return null;
 			return node.getProperty(propertyName).getString();
 		} catch (RepositoryException e) {
 			throw new ArgeoException("Cannot get property " + propertyName