GUACAMOLE-519: MR code review change to simplify getPostLogoutRedirect

bayars · bayars · commit 4763856847e0 · 2026-01-25T20:31:37.000-05:00
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java
@@ -483,10 +483,7 @@ public URI getLogoutEndpoint() throws GuacamoleException {
      *     If guacamole.properties cannot be parsed.
      */
     public URI getPostLogoutRedirectURI() throws GuacamoleException {
-        URI postLogoutRedirectURI = environment.getProperty(OPENID_POST_LOGOUT_REDIRECT_URI);
-        if (postLogoutRedirectURI != null)
-            return postLogoutRedirectURI;
-        return getRedirectURI();
+        return environment.getProperty(OPENID_POST_LOGOUT_REDIRECT_URI, getRedirectURI());
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -483,10 +483,7 @@ public URI getLogoutEndpoint() throws GuacamoleException {`
`483`	`483`	`* If guacamole.properties cannot be parsed.`
`484`	`484`	`*/`
`485`	`485`	`public URI getPostLogoutRedirectURI() throws GuacamoleException {`
`486`		`- URI postLogoutRedirectURI = environment.getProperty(OPENID_POST_LOGOUT_REDIRECT_URI);`
`487`		`- if (postLogoutRedirectURI != null)`
`488`		`- return postLogoutRedirectURI;`
`489`		`- return getRedirectURI();`
	`486`	`+ return environment.getProperty(OPENID_POST_LOGOUT_REDIRECT_URI, getRedirectURI());`
`490`	`487`	`}`
`491`	`488`
`492`	`489`	`}`