HSEARCH-2484 Minor optimisation of lookup for Provided Services

hibernate · Dec 19, 2016 · 78a720f · 78a720f
1 parent e5e525a
commit 78a720f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/engine/src/main/java/org/hibernate/search/engine/service/impl/StandardServiceManager.java b/engine/src/main/java/org/hibernate/search/engine/service/impl/StandardServiceManager.java
@@ -72,8 +72,9 @@ public <S extends Service> S requestService(Class<S> serviceRole) {
 		}
 
 		// provided services have priority over managed services
-		if ( providedServices.containsKey( serviceRole ) ) {
-			return (S) providedServices.get( serviceRole );
+		final Object providedService = providedServices.get( serviceRole );
+		if ( providedService != null ) {
+			return (S) providedService;
 		}
 
 		ServiceWrapper<S> wrapper = (ServiceWrapper<S>) cachedServices.get( serviceRole );