[Hibernate-commits] Hibernate Code SVN: r9921 - trunk/HibernateExt/metadata/src/java/org/hibernate/cfg

[<hib...@li...>]

Author: epbernard
Date: 2006-05-10 09:40:04 -0400 (Wed, 10 May 2006)
New Revision: 9921

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
Log:
ANN-340 soft deps to CGLIB

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-05-10 13:22:15 UTC (rev 9920)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java	2006-05-10 13:40:04 UTC (rev 9921)
@@ -46,7 +46,6 @@
 import javax.persistence.Transient;
 import javax.persistence.Version;
 
-import net.sf.cglib.transform.impl.InterceptFieldCallback;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.AnnotationException;
@@ -995,8 +994,10 @@
 	}
 
 	private static boolean mustBeSkipped(XProperty property, ExtendedMappings mappings) {
+		//TODO make those hardcoded tests more portable (through the bytecode provider?)
 		return property.isAnnotationPresent( Transient.class )
-				|| mappings.getReflectionManager().equals( property.getType(), InterceptFieldCallback.class );
+				|| "net.sf.cglib.transform.impl.InterceptFieldCallback".equals( property.getType().getName() )
+				|| "org.hibernate.tool.instrument.javassist.FieldHandler".equals( property.getType().getName() );
 	}
 
 	/**