From 4a6620008abf71df354840cd0efe1319ef5ded9c Mon Sep 17 00:00:00 2001 From: Matthias Piepkorn <mpiepk@gmail.com> Date: Fri, 24 Feb 2017 21:28:29 +0000 Subject: [PATCH] Show info page after successful logout, including a link to the passed service url --- src/main/java/org/keycloak/protocol/cas/utils/ContentTypeHelper.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/utils/ContentTypeHelper.java b/src/main/java/org/keycloak/protocol/cas/utils/ContentTypeHelper.java index 0e13ca6..5096474 100644 --- a/src/main/java/org/keycloak/protocol/cas/utils/ContentTypeHelper.java +++ b/src/main/java/org/keycloak/protocol/cas/utils/ContentTypeHelper.java @@ -1,5 +1,6 @@ package org.keycloak.protocol.cas.utils; +import org.jboss.resteasy.spi.BadRequestException; import org.jboss.resteasy.spi.HttpRequest; import org.keycloak.protocol.cas.CASLoginProtocol; @@ -22,7 +23,12 @@ //if parameter is set, it overrides all header values (see spec section 2.5.1) request.getMutableHeaders().putSingle(HttpHeaders.ACCEPT, "application/" + format.toLowerCase()); } - Variant variant = restRequest.selectVariant(Variant.mediaTypes(MediaType.APPLICATION_XML_TYPE, MediaType.APPLICATION_JSON_TYPE).build()); - return variant == null ? MediaType.APPLICATION_XML_TYPE : variant.getMediaType(); + try { + Variant variant = restRequest.selectVariant(Variant.mediaTypes(MediaType.APPLICATION_XML_TYPE, MediaType.APPLICATION_JSON_TYPE).build()); + return variant == null ? MediaType.APPLICATION_XML_TYPE : variant.getMediaType(); + } catch (BadRequestException e) { + //the default Accept header set by java.net.HttpURLConnection is invalid (cf. RESTEASY-960) + return MediaType.APPLICATION_XML_TYPE; + } } } -- Gitblit v1.9.1