[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth/i...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Aug  5 14:53:20 2014
New Revision: 3187

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3187&view=rev
Log:
SIDP-589 -  login.jsp - contactTypes are ignored in idpui:serviceContact

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceContactTag.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3187&r1=3186&r2=3187&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Aug  5 14:53:20 2014
@@ -9,9 +9,10 @@
 Also, updating POM to implement:
 [JXT-106] - Update Apache Santuario (xmlsec) to 1.5.6
 [SIDP-587] - log level too high?
+[SIDP-589] - login.jsp - contactTypes are ignored in idpui:serviceContact
 [SIDP-600] - Make the inbound message issuer (SP's entity ID) available to logout.jsp
 [SIDP-601] - SLO: also clear the client-side cookie when logging out at the IdP
-[SIDP-607] - Incorrect/misleading Kerberos authentication example in login.config 
+[SIDP-607] - Incorrect/misleading Kerberos authentication example in login.config
 
 Changes in Release 2.4.0
 =============================================

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceContactTag.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceContactTag.java?rev=3187&r1=3186&r2=3187&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceContactTag.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceContactTag.java Tue Aug  5 14:53:20 2014
@@ -59,15 +59,15 @@
             log.warn("no parameter provided to contactType");
             return;
         }
-        if (type.equals(ContactPersonTypeEnumeration.ADMINISTRATIVE)) {
+        if (type.equals(ContactPersonTypeEnumeration.ADMINISTRATIVE.toString())) {
             contactType = ContactPersonTypeEnumeration.ADMINISTRATIVE;
-        } else if (type.equals(ContactPersonTypeEnumeration.BILLING)) {
+        } else if (type.equals(ContactPersonTypeEnumeration.BILLING.toString())) {
             contactType = ContactPersonTypeEnumeration.BILLING;
-        } else if (type.equals(ContactPersonTypeEnumeration.OTHER)) {
+        } else if (type.equals(ContactPersonTypeEnumeration.OTHER.toString())) {
             contactType = ContactPersonTypeEnumeration.OTHER;
-        } else if (type.equals(ContactPersonTypeEnumeration.SUPPORT)) {
+        } else if (type.equals(ContactPersonTypeEnumeration.SUPPORT.toString())) {
             contactType = ContactPersonTypeEnumeration.SUPPORT;
-        } else if (type.equals(ContactPersonTypeEnumeration.TECHNICAL)) {
+        } else if (type.equals(ContactPersonTypeEnumeration.TECHNICAL.toString())) {
             contactType = ContactPersonTypeEnumeration.TECHNICAL;
         } else {
             log.warn("parameter provided to contactType:" + type + " is invalid");