[hibernate-commits] Hibernate SVN: r17748 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-10-14 15:53:42 -0400 (Wed, 14 Oct 2009)
New Revision: 17748

Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/NodeImpl.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
Log:
HV-255

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/NodeImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/NodeImpl.java	2009-10-14 17:06:14 UTC (rev 17747)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/NodeImpl.java	2009-10-14 19:53:42 UTC (rev 17748)
@@ -25,6 +25,8 @@
  */
 public class NodeImpl implements Path.Node, Serializable {
 
+	private static final long serialVersionUID = 2075466571633860499L;
+
 	private static final String INDEX_OPEN = "[";
 	private static final String INDEX_CLOSE = "]";
 
@@ -33,7 +35,6 @@
 	private Integer index;
 	private Object key;
 
-
 	public NodeImpl(String name) {
 		this.name = name;
 	}

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java	2009-10-14 17:06:14 UTC (rev 17747)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ValidatorImpl.java	2009-10-14 19:53:42 UTC (rev 17748)
@@ -706,8 +706,11 @@
 							value = ReflectionHelper.getIndexedValue( value, elem.getIndex() );
 						}
 						else if ( value != null && elem.getKey() != null ) {
-
+							value = ReflectionHelper.getMappedValue( value, elem.getKey() );
 						}
+						else if ( value != null ) {
+							throw new IllegalArgumentException( "Property path must provide index or map key" );
+						}
 						type = ReflectionHelper.getIndexedType( type );
 					}