View | Details | Raw Unified | Return to bug 59284
Collapse All | Expand All

(-)java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java (-5 / +3 lines)
Lines 102-117 Link Here
102
                    if (this.properties != null) {
102
                    if (this.properties != null) {
103
                        mergedProperties.putAll(this.properties);
103
                        mergedProperties.putAll(this.properties);
104
                    }
104
                    }
105
                    if (properties == null) {
105
                    if (properties != null) {
106
                        throw new AuthException(sm.getString("simpleServerAuthConfig.noModules"));
107
                    } else {
108
                        mergedProperties.putAll(properties);
106
                        mergedProperties.putAll(properties);
109
                    }
107
                    }
110
108
111
                    List<ServerAuthModule> modules = new ArrayList<>();
109
                    List<ServerAuthModule> modules = new ArrayList<>();
112
                    int moduleIndex = 1;
110
                    int moduleIndex = 1;
113
                    String key = SERVER_AUTH_MODULE_KEY_PREFIX + moduleIndex;
111
                    String key = SERVER_AUTH_MODULE_KEY_PREFIX + moduleIndex;
114
                    String moduleClassName = (String) properties.get(key);
112
                    String moduleClassName = (String) mergedProperties.get(key);
115
                    while (moduleClassName != null) {
113
                    while (moduleClassName != null) {
116
                        try {
114
                        try {
117
                            Class<?> clazz = Class.forName(moduleClassName);
115
                            Class<?> clazz = Class.forName(moduleClassName);
Lines 127-133 Link Here
127
                        // Look for the next module
125
                        // Look for the next module
128
                        moduleIndex++;
126
                        moduleIndex++;
129
                        key = SERVER_AUTH_MODULE_KEY_PREFIX + moduleIndex;
127
                        key = SERVER_AUTH_MODULE_KEY_PREFIX + moduleIndex;
130
                        moduleClassName = (String) properties.get(key);
128
                        moduleClassName = (String) mergedProperties.get(key);
131
                    }
129
                    }
132
130
133
                    if (modules.size() == 0) {
131
                    if (modules.size() == 0) {

Return to bug 59284