[hibernate-commits] Hibernate SVN: r10720 - trunk/Hibernate3/src/org/hibernate/engine

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2006-11-06 06:35:40 -0500 (Mon, 06 Nov 2006)
New Revision: 10720

Modified:
   trunk/Hibernate3/src/org/hibernate/engine/Cascade.java
Log:
rollback

Modified: trunk/Hibernate3/src/org/hibernate/engine/Cascade.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/engine/Cascade.java	2006-11-06 11:27:36 UTC (rev 10719)
+++ trunk/Hibernate3/src/org/hibernate/engine/Cascade.java	2006-11-06 11:35:40 UTC (rev 10720)
@@ -12,7 +12,6 @@
 import org.hibernate.event.EventSource;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.AbstractComponentType;
 import org.hibernate.type.AssociationType;
 import org.hibernate.type.CollectionType;
@@ -113,7 +112,7 @@
 
 		if ( persister.hasCascades() || action.requiresNoCascadeChecking() ) { // performance opt
 			if ( log.isTraceEnabled() ) {
-				log.trace( "processing cascade " + action + " for: " + MessageHelper.infoString( persister, persister.getIdentifier( parent, eventSource.getEntityMode() ), persister.getFactory() ) );
+				log.trace( "processing cascade " + action + " for: " + persister.getEntityName() );
 			}
 
 			Type[] types = persister.getPropertyTypes();
@@ -128,13 +127,8 @@
 				}
 
 				if ( style.doCascade( action ) ) {
-					Object propertyValue = persister.getPropertyValue( parent, i, entityMode );
-					if(log.isTraceEnabled()) {
-						log.trace( "cascading " + action + " via property " + persister.getPropertyNames()[i] + " of type " + types[i].getName() + " with " + (propertyValue==null?" null value":"value"));
-					}
-					
 					cascadeProperty(
-					        propertyValue,
+					        persister.getPropertyValue( parent, i, entityMode ),
 					        types[i],
 					        style,
 					        anything,
@@ -142,9 +136,6 @@
 					);
 				}
 				else if ( action.requiresNoCascadeChecking() ) {
-					if(log.isTraceEnabled()) {
-						log.trace( "no-cascading " + action + " via property " + persister.getPropertyNames()[i] + " of type " + types[i].getName());
-					}
 					action.noCascade(
 							eventSource,
 							persister.getPropertyValue( parent, i, entityMode ),
@@ -156,10 +147,8 @@
 			}
 
 			if ( log.isTraceEnabled() ) {
-				log.trace( "done processing cascade " + action + " for: " + MessageHelper.infoString( persister, persister.getIdentifier( parent, eventSource.getEntityMode() ), persister.getFactory() ) );
+				log.trace( "done processing cascade " + action + " for: " + persister.getEntityName() );
 			}
-		} else {
-			// log skipped cascading ?
 		}
 	}