two minor changes

Author: gavinking

hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java

@@ -157,19 +157,21 @@ private void evictCache(Object entity, EntityPersister persister, EventSource se
 		}
 	}
 
-	private Object getIdentifier(EventSource session, Object obj) {
-		Object id = null;
-		if ( obj != null ) {
-			id = session.getContextEntityIdentifier( obj );
+	private Object getIdentifier(EventSource session, Object object) {
+		if ( object != null ) {
+			final Object id = session.getContextEntityIdentifier( object );
 			if ( id == null ) {
-				final EntityPersister persister = session.getFactory()
-						.getRuntimeMetamodels()
-						.getMappingMetamodel()
-						.getEntityDescriptor( obj.getClass() );
-				id = persister.getIdentifier( obj, session );
+				return session.getFactory().getMappingMetamodel()
+						.getEntityDescriptor( object.getClass() )
+						.getIdentifier( object, session );
 			}
+			else {
+				return id;
+			}
+		}
+		else {
+			return null;
 		}
-		return id;
 	}
 
 	private void evict(Object id, CollectionPersister collectionPersister, EventSource session) {

hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java

@@ -62,10 +62,9 @@ public String getPropertyName() {
 	@Override
 	public boolean isNull(Object owner, SharedSessionContractImplementor session) {
 		if ( propertyName != null ) {
-			final EntityPersister ownerPersister = session.getFactory()
-					.getRuntimeMetamodels()
-					.getMappingMetamodel()
-					.getEntityDescriptor( entityName );
+			final EntityPersister ownerPersister =
+					session.getFactory().getMappingMetamodel()
+							.getEntityDescriptor( entityName );
 			final Object id = session.getContextEntityIdentifier( owner );
 			final EntityKey entityKey = session.generateEntityKey( id, ownerPersister );
 			return session.getPersistenceContextInternal().isPropertyNull( entityKey, getPropertyName() );