[hibernate-commits] Hibernate SVN: r16496 - in validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine: resolver and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2009-05-01 06:44:22 -0400 (Fri, 01 May 2009)
New Revision: 16496

Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ExecutionContext.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/resolver/JPATraversableResolver.java
Log:
HV-154 root bean class must always be passed (no null allowed)

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ExecutionContext.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ExecutionContext.java	2009-05-01 09:54:36 UTC (rev 16495)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ExecutionContext.java	2009-05-01 10:44:22 UTC (rev 16496)
@@ -176,8 +176,6 @@
 		return rootBean;
 	}
 
-	@SuppressWarnings("unchecked")
-	// safe case since rootBean is of type T!
 	public Class<T> getRootBeanClass() {
 		return rootBeanClass;
 	}
@@ -288,15 +286,14 @@
 			return false;
 		}
 
-		Class<?> rootBeanClass = rootBean == null ? null : rootBean.getClass();
 		return traversableResolver.isTraversable(
 				peekCurrentBean(),
 				peekProperty(),
-				rootBeanClass,
+				getRootBeanClass(),
 				peekParentPath(),
 				metaConstraint.getElementType()
 		);
-	}
+	}  
 
 	public List<ConstraintViolationImpl<T>> createConstraintViolations(Object value, ConstraintValidatorContextImpl constraintValidatorContext) {
 		List<ConstraintViolationImpl<T>> constraintViolations = new ArrayList<ConstraintViolationImpl<T>>();

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/resolver/JPATraversableResolver.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/resolver/JPATraversableResolver.java	2009-05-01 09:54:36 UTC (rev 16495)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/resolver/JPATraversableResolver.java	2009-05-01 10:44:22 UTC (rev 16496)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -27,6 +27,7 @@
 public class JPATraversableResolver implements TraversableResolver {
 
 	public boolean isTraversable(Object traversableObject, String traversableProperty, Class<?> rootBeanType, String pathToTraversableObject, ElementType elementType) {
-		return Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty );
+		return traversableObject == null ||
+				Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty );
 	}
 }