HV-1480 Only set the property value if required

Only property and container node exposes it to users.
hibernate · Sep 11, 2017 · 49b6bf5 · 49b6bf5
1 parent 491ec28
commit 49b6bf5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/ValueContext.java b/engine/src/main/java/org/hibernate/validator/internal/engine/ValueContext.java
@@ -192,7 +192,7 @@ public final void setCurrentGroup(Class<?> currentGroup) {
 	}
 
 	public final void setCurrentValidatedValue(V currentValue) {
-		propertyPath.setLeafNodeValue( currentValue );
+		propertyPath.setLeafNodeValueIfRequired( currentValue );
 		this.currentValue = currentValue;
 	}
 

diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/path/PathImpl.java b/engine/src/main/java/org/hibernate/validator/internal/engine/path/PathImpl.java
@@ -222,13 +222,16 @@ public NodeImpl makeLeafNodeIterableAndSetMapKey(Object key) {
 		return currentLeafNode;
 	}
 
-	public NodeImpl setLeafNodeValue(Object value) {
-		requiresWriteableNodeList();
+	public NodeImpl setLeafNodeValueIfRequired(Object value) {
+		// The value is only exposed for property and container element nodes
+		if ( currentLeafNode.getKind() == ElementKind.PROPERTY || currentLeafNode.getKind() == ElementKind.CONTAINER_ELEMENT ) {
+			requiresWriteableNodeList();
 
-		currentLeafNode = NodeImpl.setPropertyValue( currentLeafNode, value );
+			currentLeafNode = NodeImpl.setPropertyValue( currentLeafNode, value );
 
-		nodeList.set( nodeList.size() - 1, currentLeafNode );
-		hashCode = -1;
+			nodeList.set( nodeList.size() - 1, currentLeafNode );
+			hashCode = -1;
+		}
 		return currentLeafNode;
 	}