Skip to content

Commit bee5386

Browse files
Stefan Haasopenshift-merge-robot
Stefan Haas
authored andcommitted
Adjust order of assigning the default CM name
1 parent 07b986e commit bee5386

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/org/openshift/jenkins/plugins/openshiftlogin/OpenShiftOAuth2SecurityRealm.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,9 @@ boolean populateDefaults() throws IOException, GeneralSecurityException {
455455
LOGGER.info(format(msg5, this.defaultedServerPrefix));
456456
}
457457

458-
configMapName = EnvVars.masterEnvVars.get("CONFIG_MAP_NAME");
459-
if (configMapName == null) {
460-
configMapName = CONFIG_MAP_NAME_DEFAULT ;
458+
configMapName = CONFIG_MAP_NAME_DEFAULT;
459+
if (EnvVars.masterEnvVars.get("CONFIG_MAP_NAME") != null) {
460+
configMapName = EnvVars.masterEnvVars.get("CONFIG_MAP_NAME");
461461
}
462462

463463
return runningInOpenShiftPodWithRequiredOAuthFeatures;

0 commit comments

Comments
 (0)