ServiceRegistryInitializer: Doing a regex match on service id l… (ape…

…reo#4071)
hsiun · Jul 1, 2019 · 74274e7 · 74274e7
1 parent 483837d
commit 74274e7
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/...e-services-registry/src/main/java/org/apereo/cas/services/ServiceRegistryInitializer.java b/...e-services-registry/src/main/java/org/apereo/cas/services/ServiceRegistryInitializer.java
@@ -54,16 +54,11 @@ public void initServiceRegistryIfNecessary() {
 
     private boolean findExistingMatchForService(final RegisteredService r) {
         if (StringUtils.isNotBlank(r.getServiceId())) {
-            val match = this.serviceRegistry.findServiceById(r.getServiceId());
-            if (match != null && match.getClass().equals(r.getClass())) {
+            val match = this.serviceRegistry.findServiceByExactServiceId(r.getServiceId());
+            if (match != null) {
                 LOGGER.warn("Skipping [{}] JSON service definition as a matching service [{}] is found in the registry", r.getName(), match.getName());
                 return true;
             }
-            val match2 = this.serviceRegistry.findServiceByExactServiceId(r.getServiceId());
-            if (match2 != null) {
-                LOGGER.warn("Skipping [{}] JSON service definition as a matching service [{}] is found in the registry", r.getName(), match2.getName());
-                return true;
-            }
         }
 
         val match = this.serviceRegistry.findServiceById(r.getId());