HHH-15274 Field LazyAttributeLoadingInterceptor#lazyFields can never be null

Author: Sanne

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/LazyAttributeLoadingInterceptor.java

@@ -125,15 +125,15 @@ public boolean isAttributeLoaded(String fieldName) {
 	}
 
 	private boolean isLazyAttribute(String fieldName) {
-		return lazyFields == null || lazyFields.contains( fieldName );
+		return lazyFields.contains( fieldName );
 	}
 
 	private boolean isInitializedLazyField(String fieldName) {
 		return initializedLazyFields != null && initializedLazyFields.contains( fieldName );
 	}
 
 	public boolean hasAnyUninitializedAttributes() {
-		if ( lazyFields == null || lazyFields.isEmpty() ) {
+		if ( lazyFields.isEmpty() ) {
 			return false;
 		}
 

hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java

@@ -312,6 +312,7 @@ public static Properties asProperties(Map<?,?> map) {
 	 * The returned Set might be immutable, but there is no guarantee of this:
 	 * consider it immutable but don't rely on this.
 	 * The goal is to save memory.
+	 * @return will never return null, but might return an immutable collection.
 	 */
 	public static <T> Set<T> toSmallSet(Set<T> set) {
 		switch ( set.size() ) {