From 97e6573e32d751a7cb03f46adeb85f9513149502 Mon Sep 17 00:00:00 2001 From: Scott Battaglia Date: Sun, 11 Sep 2011 16:35:23 +0000 Subject: [PATCH] NOJIRA accidental Java 1.6 dependency --- .../cas/client/validation/Saml11TicketValidator.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java index 69025d6..117cbe3 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/validation/Saml11TicketValidator.java @@ -68,11 +68,19 @@ public final class Saml11TicketValidator extends AbstractUrlBasedTicketValidator } } + protected byte[] getBytes(final String text) { + try { + return CommonUtils.isNotBlank(getEncoding()) ? text.getBytes(getEncoding()) : text.getBytes(); + } catch (final Exception e) { + return text.getBytes(); + } + } + protected Assertion parseResponseFromServer(final String response) throws TicketValidationException { try { final String removeStartOfSoapBody = response.substring(response.indexOf("") + 15); final String removeEndOfSoapBody = removeStartOfSoapBody.substring(0, removeStartOfSoapBody.indexOf("")); - final SAMLResponse samlResponse = new SAMLResponse(new ByteArrayInputStream(CommonUtils.isNotBlank(getEncoding()) ? removeEndOfSoapBody.getBytes(Charset.forName(getEncoding())) : removeEndOfSoapBody.getBytes())); + final SAMLResponse samlResponse = new SAMLResponse(new ByteArrayInputStream(getBytes(removeEndOfSoapBody))); if (!samlResponse.getAssertions().hasNext()) { throw new TicketValidationException("No assertions found.");