From eed831191a4bde1291fa4f4290ee99ce6ea01e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Ord=C3=A1s?= <katelme@gmail.com>
Date: Tue, 8 Jan 2013 13:28:35 +0100
Subject: [PATCH 1/2] re-add support for multi-valued attributes

Add tests for ensure re-add support for multi-valued attributes is working
---
 .../validation/Cas20ServiceTicketValidatorTests.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java
index 0b1f137..646594f 100644
--- a/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java
+++ b/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java
@@ -139,7 +139,7 @@ public final class Cas20ServiceTicketValidatorTests extends AbstractTicketValida
             + USERNAME
             + "</cas:user><cas:proxyGrantingTicket>"
             + PGTIOU
-            + "</cas:proxyGrantingTicket><cas:attributes><cas:password>test</cas:password><cas:eduPersonId>id</cas:eduPersonId><cas:longAttribute>test1\n\ntest</cas:longAttribute></cas:attributes></cas:authenticationSuccess></cas:serviceResponse>";
+            + "</cas:proxyGrantingTicket><cas:attributes><cas:password>test</cas:password><cas:eduPersonId>id</cas:eduPersonId><cas:longAttribute>test1\n\ntest</cas:longAttribute><cas:multivaluedAttribute>value1</cas:multivaluedAttribute><cas:multivaluedAttribute>value2</cas:multivaluedAttribute></cas:attributes></cas:authenticationSuccess></cas:serviceResponse>";
         
         server.content = RESPONSE.getBytes(server.encoding);
         final Assertion assertion = this.ticketValidator.validate("test", "test");
@@ -147,6 +147,12 @@ public final class Cas20ServiceTicketValidatorTests extends AbstractTicketValida
         assertEquals("test", assertion.getPrincipal().getAttributes().get("password"));
         assertEquals("id", assertion.getPrincipal().getAttributes().get("eduPersonId"));
         assertEquals("test1\n\ntest", assertion.getPrincipal().getAttributes().get("longAttribute"));
+        try {
+            List<?> multivalued = (List<?>) assertion.getPrincipal().getAttributes().get("multivaluedAttribute");
+            assertArrayEquals(new String[]{"value1", "value2"}, multivalued.toArray());
+        } catch (Exception e) {
+            fail("'multivaluedAttribute' attribute expected as List<Object> object.");
+        }
         //assertEquals(PGT, assertion.getProxyGrantingTicketId());
     }
 

From 077e991ae65bef6ff0134c3a7d3b4932e3e7d1c3 Mon Sep 17 00:00:00 2001
From: Scott Battaglia <scott.battaglia@gmail.com>
Date: Tue, 18 Jun 2013 22:38:25 -0400
Subject: [PATCH 2/2] CASC-207

Converted logger to static for de-serialization purposes.
---
 .../org/jasig/cas/client/proxy/Cas20ProxyRetriever.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java
index a77b11f..4a5a26a 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java
@@ -44,12 +44,9 @@ import java.net.URLEncoder;
 public final class Cas20ProxyRetriever implements ProxyRetriever {
 
     /** Unique Id for serialization. */
-	  private static final long serialVersionUID = 560409469568911791L;
+	private static final long serialVersionUID = 560409469568911792L;
 
-	  /**
-     * Instance of Commons Logging.
-     */
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static final Logger logger = LoggerFactory.getLogger(Cas20ProxyRetriever.class);
 
     /**
      * Url to CAS server.