From 59ec34d5b673460a83009f024ae18437f85e452b Mon Sep 17 00:00:00 2001 From: Emmanuel Bernard Date: Mon, 4 Oct 2010 14:05:41 +0000 Subject: [PATCH] HHH-5578 fix incorrect use of JDK 6 git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@20772 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- core/src/main/java/org/hibernate/cfg/AnnotationBinder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java index 8454c43273..517cac3393 100644 --- a/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -2661,7 +2661,7 @@ public final class AnnotationBinder { final JoinColumn joinColumn = property.getAnnotation( JoinColumn.class ); if ( property.isAnnotationPresent( ManyToOne.class ) && joinColumn != null - && !joinColumn.name().isEmpty() + && ! BinderHelper.isEmptyAnnotationValue( joinColumn.name() ) && joinColumn.name().equals( columnName ) && !property.isAnnotationPresent( MapsId.class ) ) { hasSpecjManyToOne = true;