Correct header to attribute name mapping
authorgilbert <gilbert@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 18 Oct 2005 14:58:29 +0000 (14:58 +0000)
committergilbert <gilbert@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 18 Oct 2005 14:58:29 +0000 (14:58 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1883 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

lib/shib-filter.jar
src/edu/internet2/middleware/shibboleth/serviceprovider/FilterSupportImpl.java
src/edu/internet2/middleware/shibboleth/serviceprovider/SessionManager.java

index 071427f..b43fb70 100644 (file)
Binary files a/lib/shib-filter.jar and b/lib/shib-filter.jar differ
index 7d0e5ad..a58a978 100644 (file)
@@ -117,7 +117,7 @@ public class FilterSupportImpl implements FilterSupport {
          * blocks and turn this into a more usable pair of Maps keyed
          * by attributeid and returning the nickname or header name.
          */
-        rmdata.attributeToHeader = new HashMap();
+        rmdata.headerToAttribute = new HashMap();
         rmdata.attributeToAlias = new HashMap();
         AAP[] providers = appinfo.getAAPProviders();
         for (int i=0;i<providers.length;i++) {
@@ -129,7 +129,7 @@ public class FilterSupportImpl implements FilterSupport {
                 String alias = rule.getAlias();
                 String header = rule.getHeader();
                 if (header!=null && header.length()!=0)
-                    rmdata.attributeToHeader.put(name,header);
+                    rmdata.headerToAttribute.put(header,name);
                 if (alias!=null && alias.length()!=0)
                     rmdata.attributeToAlias.put(name,alias);
            }
index 59a6367..baccca4 100644 (file)
@@ -447,7 +447,7 @@ reserveSession(
                         }
                         if (list.size()==1)
                             attributeMap.put(name,val);
-                        else
+                        else if (list.size()>1)
                             attributeMap.put(name,list);
                     }
                 }