HHH-7861 EntityManager.find() should return null instead of EntityNotFoundException (message improvement)

Author: scottmarlow

hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java

@@ -810,9 +810,11 @@ public <A> A find(Class<A> entityClass, Object primaryKey, LockModeType lockMode
 		catch ( EntityNotFoundException ignored ) {
 			// DefaultLoadEventListener.returnNarrowedProxy may throw ENFE (see HHH-7861 for details),
 			// which find() should not throw.  Find() should return null if the entity was not found.
-            if ( LOG.isDebugEnabled() ) {
-                LOG.ignoringEntityNotFound( entityClass != null ? entityClass.getName(): null, ignored );
-            }
+			if ( LOG.isDebugEnabled() ) {
+				String entityName = entityClass != null ? entityClass.getName(): null;
+				String identifierValue = primaryKey != null ? primaryKey.toString() : null ;
+				LOG.ignoringEntityNotFound( entityName, identifierValue );
+			}
 			return null;
 		}
 		catch ( ObjectDeletedException e ) {

hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerMessageLogger.java

@@ -38,8 +38,6 @@
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 
-import javax.persistence.EntityNotFoundException;
-
 /**
  * The jboss-logging {@link MessageLogger} for the hibernate-entitymanager module.  It reserves message ids ranging from
  * 15001 to 20000 inclusively.
@@ -105,9 +103,9 @@ void unableToLocateStaticMetamodelField( String name,
     void usingProvidedDataSource();
 
 
-    @LogMessage( level = DEBUG )
-    @Message( value = "Returning null (as required by JPA spec) rather than throwing EntityNotFoundException, " +
-            "as the entity (%s) does not exist", id = 15013 )
-    void ignoringEntityNotFound( String entityName,
-                           @Cause EntityNotFoundException e );
+	@LogMessage( level = DEBUG )
+	@Message( value = "Returning null (as required by JPA spec) rather than throwing EntityNotFoundException, " +
+			"as the entity (type=%s, id=%s) does not exist", id = 15013 )
+	void ignoringEntityNotFound( String entityName, String identifier);
+
 }