diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index bf42b722de..0c477b6d20 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -550,7 +550,6 @@ public class StatefulPersistenceContext implements PersistenceContext { lockMode, existsInDatabase, persister, - session.getTenantIdentifier(), disableVersionIncrement, lazyPropertiesAreUnfetched, this diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java index 2bfc575edc..caf36e8df4 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java @@ -52,7 +52,6 @@ public final class EntityEntry implements Serializable { private boolean existsInDatabase; private Object version; private transient EntityPersister persister; // for convenience to save some lookups - private final String tenantId; private final String entityName; private transient EntityKey cachedEntityKey; // cached EntityKey (lazy-initialized) private boolean isBeingReplicated; @@ -69,7 +68,6 @@ public final class EntityEntry implements Serializable { final LockMode lockMode, final boolean existsInDatabase, final EntityPersister persister, - final String tenantId, final boolean disableVersionIncrement, final boolean lazyPropertiesAreUnfetched, final PersistenceContext persistenceContext) { @@ -87,7 +85,6 @@ public final class EntityEntry implements Serializable { this.isBeingReplicated=disableVersionIncrement; this.loadedWithLazyPropertiesUnfetched = lazyPropertiesAreUnfetched; this.persister=persister; - this.tenantId = tenantId; this.entityName = persister == null ? null : persister.getEntityName(); this.persistenceContext = persistenceContext; } @@ -100,7 +97,6 @@ public final class EntityEntry implements Serializable { final SessionFactoryImplementor factory, final String entityName, final Serializable id, - final String tenantId, final Status status, final Status previousStatus, final Object[] loadedState, @@ -114,7 +110,6 @@ public final class EntityEntry implements Serializable { this.entityName = entityName; this.persister = ( factory == null ? null : factory.getEntityPersister( entityName ) ); this.id = id; - this.tenantId = tenantId; this.status = status; this.previousStatus = previousStatus; this.loadedState = loadedState; @@ -396,7 +391,6 @@ public final class EntityEntry implements Serializable { public void serialize(ObjectOutputStream oos) throws IOException { oos.writeObject( entityName ); oos.writeObject( id ); - oos.writeObject( tenantId ); oos.writeObject( status.name() ); oos.writeObject( (previousStatus == null ? "" : previousStatus.name()) ); // todo : potentially look at optimizing these two arrays @@ -431,7 +425,6 @@ public final class EntityEntry implements Serializable { ( persistenceContext.getSession() == null ? null : persistenceContext.getSession().getFactory() ), (String) ois.readObject(), ( Serializable ) ois.readObject(), - (String) ois.readObject(), Status.valueOf( (String) ois.readObject() ), ( ( previousStatusString = ( String ) ois.readObject() ).length() == 0 ? null : diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java index 6003d166eb..31f0b4caed 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java @@ -302,7 +302,6 @@ public class EnhancerTest extends BaseUnitTestCase { LockMode.NONE, false, null, - null, false, false, null diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/customer/CustomerEnhancerTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/customer/CustomerEnhancerTest.java index a95cda980f..f2dd994132 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/customer/CustomerEnhancerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/customer/CustomerEnhancerTest.java @@ -263,7 +263,6 @@ public class CustomerEnhancerTest extends BaseUnitTestCase { LockMode.NONE, false, null, - null, false, false, null