From b73d96162e93146ebc8d7e76cc3bbc57ea3b399e Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 24 Jan 2023 16:00:28 +0000
Subject: [PATCH] GitHub Actions: replace deprecated set-output workflow command
---
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..b5ad8a5 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/ContentTypeHelper.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/ContentTypeHelper.java
@@ -3,6 +3,7 @@
import org.jboss.resteasy.spi.HttpRequest;
import org.keycloak.protocol.cas.CASLoginProtocol;
+import javax.ws.rs.BadRequestException;
import javax.ws.rs.core.*;
public class ContentTypeHelper {
@@ -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