[java-identity-provider] branch main updated: Adjust module enable testing and use a linked hash map for results.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2d50b0b4d81ea29f624588943f496ed5a3d499eb

The following commit(s) were added to refs/heads/main by this push:
       new  2d50b0b4d Adjust module enable testing and use a linked hash map for results.
2d50b0b4d is described below

commit 2d50b0b4d81ea29f624588943f496ed5a3d499eb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 30 08:44:36 2020 -0400

    Adjust module enable testing and use a linked hash map for results.
---
 .../net/shibboleth/idp/module/AbstractIdPModule.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java b/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java
index e9cfe01ff..0caf9b75e 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/module/AbstractIdPModule.java
@@ -32,7 +32,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -103,14 +103,14 @@ public abstract class AbstractIdPModule implements IdPModule {
         for (final ModuleResource resource : moduleResources) {
             final Path resolved = moduleContext.getIdPHome().resolve(resource.getDestination());
             log.debug("Module {}: resolved resource destination {}", getId(), resolved);
-            if (resolved.toFile().exists()) {
-                log.debug("Module {}: resource destination {} exists, module is enabled", getId(), resolved);
-                return true;
+            if (!resolved.toFile().exists()) {
+                log.debug("Module {}: resource destination {} missing, module is disabled", getId(), resolved);
+                return false;
             }
         }
         
-        log.debug("Module {} is not enabled", getId());
-        return false;
+        log.debug("Module {} is enabled", getId());
+        return true;
     }
     
     /** {@inheritDoc} */
@@ -125,7 +125,7 @@ public abstract class AbstractIdPModule implements IdPModule {
         final Map<ModuleResource,ResourceResult> results;
         
         if (!moduleResources.isEmpty()) {
-            results = new HashMap<>(moduleResources.size());
+            results = new LinkedHashMap<>(moduleResources.size());
 
             for (final ModuleResource resource : moduleResources) {
                 results.put(resource, ((BasicModuleResource) resource).enable(moduleContext));
@@ -146,7 +146,7 @@ public abstract class AbstractIdPModule implements IdPModule {
         final Map<ModuleResource,ResourceResult> results;
         
         if (!moduleResources.isEmpty()) {
-            results = new HashMap<>(moduleResources.size());
+            results = new LinkedHashMap<>(moduleResources.size());
             for (final ModuleResource resource : moduleResources) {
                 results.put(resource, ((BasicModuleResource) resource).disable(moduleContext, clean));
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.