From fb42fefaf9e122b5c0ea7c8b17670bf47397193e Mon Sep 17 00:00:00 2001
From: Scott Battaglia <scott.battaglia@gmail.com>
Date: Sun, 11 Sep 2011 16:46:53 +0000
Subject: [PATCH] NOJIRA

fixed some bugs and updated pom to 3.3-SNAPSHOT
---
 cas-client-core/pom.xml                                     | 2 +-
 .../main/java/org/jasig/cas/client/util/CommonUtils.java    | 6 +++++-
 cas-client-integration-atlassian/pom.xml                    | 2 +-
 cas-client-integration-jboss/pom.xml                        | 2 +-
 cas-client-integration-tomcat-common/pom.xml                | 2 +-
 cas-client-integration-tomcat-v6/pom.xml                    | 2 +-
 cas-client-integration-tomcat-v7/pom.xml                    | 2 +-
 cas-client-support-distributed-ehcache/pom.xml              | 2 +-
 cas-client-support-distributed-memcached/pom.xml            | 2 +-
 pom.xml                                                     | 2 +-
 10 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml
index 6359edd..c630b33 100644
--- a/cas-client-core/pom.xml
+++ b/cas-client-core/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
index f2456cd..2073317 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
@@ -212,12 +212,16 @@ public final class CommonUtils {
     protected static String findMatchingServerName(final HttpServletRequest request, final String serverName) {
         final String[] serverNames = serverName.split(" ");
 
-        if (serverNames == null || serverNames.length == 0) {
+        if (serverNames == null || serverNames.length == 0 || serverNames.length == 1) {
             return serverName;
         }
 
         final String comparisonHost = request.getHeader("Host");
 
+        if (comparisonHost == null) {
+            return serverName;
+        }
+
         for (final String server : serverNames) {
             final String lowerCaseServer = server.toLowerCase();
 
diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml
index 490d660..a45fe73 100644
--- a/cas-client-integration-atlassian/pom.xml
+++ b/cas-client-integration-atlassian/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/cas-client-integration-jboss/pom.xml b/cas-client-integration-jboss/pom.xml
index 900107a..aac7f49 100644
--- a/cas-client-integration-jboss/pom.xml
+++ b/cas-client-integration-jboss/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/cas-client-integration-tomcat-common/pom.xml b/cas-client-integration-tomcat-common/pom.xml
index 53b29ca..ea3d953 100644
--- a/cas-client-integration-tomcat-common/pom.xml
+++ b/cas-client-integration-tomcat-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cas-client</artifactId>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cas-client-integration-tomcat-v6/pom.xml b/cas-client-integration-tomcat-v6/pom.xml
index dfd2f36..2fe2aa7 100644
--- a/cas-client-integration-tomcat-v6/pom.xml
+++ b/cas-client-integration-tomcat-v6/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cas-client</artifactId>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cas-client-integration-tomcat-v7/pom.xml b/cas-client-integration-tomcat-v7/pom.xml
index ea01f95..4c5c13f 100644
--- a/cas-client-integration-tomcat-v7/pom.xml
+++ b/cas-client-integration-tomcat-v7/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cas-client</artifactId>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/cas-client-support-distributed-ehcache/pom.xml b/cas-client-support-distributed-ehcache/pom.xml
index bf99708..69b1f65 100644
--- a/cas-client-support-distributed-ehcache/pom.xml
+++ b/cas-client-support-distributed-ehcache/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cas-client</artifactId>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>Jasig CAS Client for Java - Distributed Proxy Storage Support: EhCache</name>
diff --git a/cas-client-support-distributed-memcached/pom.xml b/cas-client-support-distributed-memcached/pom.xml
index 8c1ad9d..fae8559 100644
--- a/cas-client-support-distributed-memcached/pom.xml
+++ b/cas-client-support-distributed-memcached/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cas-client</artifactId>
         <groupId>org.jasig.cas.client</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 8c64be3..0268c24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jasig.cas.client</groupId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.3-SNAPSHOT</version>
     <artifactId>cas-client</artifactId>
     <packaging>pom</packaging>
     <name>Jasig CAS Client for Java</name>