1 files changed, 7 insertions, 7 deletions
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java
index b7bafe0d..0aaf1ccb 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyJerseyServer.java
@@ -145,14 +145,14 @@ public class JettyJerseyServer extends JettyServletServer {
      */
     protected synchronized ServletHolder getServlet(String servletPath) {
 
-        ServletHolder jerseyServlet = servlets.get(servletPath);
-        if (jerseyServlet == null) {
-            jerseyServlet = context.addServlet(org.glassfish.jersey.servlet.ServletContainer.class, servletPath);
+        return servlets.computeIfAbsent(servletPath, key -> {
+
+            ServletHolder jerseyServlet =
+                            context.addServlet(org.glassfish.jersey.servlet.ServletContainer.class, servletPath);
             jerseyServlet.setInitOrder(0);
-            servlets.put(servletPath, jerseyServlet);
-        }
 
-        return jerseyServlet;
+            return jerseyServlet;
+        });
     }
 
     @Override
@@ -238,7 +238,7 @@ public class JettyJerseyServer extends JettyServletServer {
         }
 
         jerseyServlet.setInitParameter(ServerProperties.PROVIDER_CLASSNAMES, initClasses);
-        
+
         jerseyServlet.setInitParameter(ServerProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true");
     }