Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-9001 Unnecessary Stack object being allocated in 

org.hibernate.engine.internal.Cascade

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
This commit is contained in:
Sanne Grinovero 2014-02-26 17:41:22 -05:00 committed by Brett Meyer
parent 84f6fde1b3
commit 5475d9f964
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
View File

@ -27,7 +27,6 @@ import java.io.Serializable;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Stack;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.collection.spi.PersistentCollection;
@ -59,6 +58,7 @@ import org.hibernate.type.Type;
public final class Cascade { public final class Cascade {
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Cascade.class ); private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Cascade.class );
private int componentPathStackDepth = 0;
private final CascadingAction action; private final CascadingAction action;
private final EventSource eventSource; private final EventSource eventSource;
private CascadePoint cascadePoint; private CascadePoint cascadePoint;
@ -183,7 +183,7 @@ public final class Cascade {
final EntityEntry entry = eventSource.getPersistenceContext().getEntry( parent ); final EntityEntry entry = eventSource.getPersistenceContext().getEntry( parent );
if ( entry != null && entry.getStatus() != Status.SAVING ) { if ( entry != null && entry.getStatus() != Status.SAVING ) {
final Object loadedValue; final Object loadedValue;
if ( componentPathStack.isEmpty() ) { if ( componentPathStackDepth == 0 ) {
// association defined on entity // association defined on entity
loadedValue = entry.getLoadedValue( propertyName ); loadedValue = entry.getLoadedValue( propertyName );
} }
@ -251,8 +251,6 @@ public final class Cascade {
return type.isEntityType() && ( (EntityType) type ).isLogicalOneToOne(); return type.isEntityType() && ( (EntityType) type ).isLogicalOneToOne();
} }
private Stack<String> componentPathStack = new Stack<String>();
private boolean cascadeAssociationNow(AssociationType associationType) { private boolean cascadeAssociationNow(AssociationType associationType) {
return associationType.getForeignKeyDirection().cascadeNow( cascadePoint ); return associationType.getForeignKeyDirection().cascadeNow( cascadePoint );
} }
@ -263,7 +261,7 @@ public final class Cascade {
final CompositeType componentType, final CompositeType componentType,
final String componentPropertyName, final String componentPropertyName,
final Object anything) { final Object anything) {
componentPathStack.push( componentPropertyName ); componentPathStackDepth++;
final Object[] children = componentType.getPropertyValues( child, eventSource ); final Object[] children = componentType.getPropertyValues( child, eventSource );
final Type[] types = componentType.getSubtypes(); final Type[] types = componentType.getSubtypes();
for ( int i=0; i<types.length; i++ ) { for ( int i=0; i<types.length; i++ ) {
@ -281,7 +279,7 @@ public final class Cascade {
); );
} }
} }
componentPathStack.pop(); componentPathStackDepth--;
} }
private void cascadeAssociation( private void cascadeAssociation(