Skip to content

Commit 3068d37

Browse files
committed
HV-2135 Do not create unnecessary context for cascading into container elements
Signed-off-by: marko-bekhta <[email protected]>
1 parent 581bad1 commit 3068d37

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -781,14 +781,13 @@ private void doValidate(Object value, String nodeName) {
781781

782782
// Cascade validation to container elements if we are dealing with a container element
783783
if ( cascadingMetaData.hasContainerElementsMarkedForCascading() ) {
784-
ValueContext<?, Object> cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( valueContext, value );
785784
if ( cascadingMetaData.getTypeParameter() != null ) {
786785
cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );
787786
}
788787

789-
cascadedTypeArgumentValueContext.appendTypeParameterNode( nodeName );
788+
cascadedValueContext.appendTypeParameterNode( nodeName );
790789

791-
validateCascadedContainerElementsInContext( value, validationContext, cascadedTypeArgumentValueContext, cascadingMetaData, validationOrder );
790+
validateCascadedContainerElementsInContext( value, validationContext, cascadedValueContext, cascadingMetaData, validationOrder );
792791
}
793792
}
794793
}

engine/src/main/java/org/hibernate/validator/internal/engine/path/MutablePath.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ public void setLeafNodeValueIfRequired(Object value) {
172172
// The value is only exposed for property and container element nodes
173173
if ( currentLeafNode.getKind() == ElementKind.PROPERTY || currentLeafNode.getKind() == ElementKind.CONTAINER_ELEMENT ) {
174174
currentLeafNode.setPropertyValue( value );
175-
176-
// the property value is not part of the NodeImpl hashCode so we don't need to reset the PathImpl hashCode
177175
}
178176
}
179177

0 commit comments

Comments
 (0)