[java-opensaml COMMIT] /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributes...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 22 15:05:56 2014
New Revision: 4042

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4042&view=rev
Log:
IDP-341 - Testing use of tag predicate with relying party config.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java?rev=4042&r1=4041&r2=4042&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java Mon Sep 22 15:05:56 2014
@@ -145,7 +145,7 @@
     public static class Candidate {
         
         /** Attribute Name. */
-        @Nonnull @NotEmpty private final String name;
+        @Nonnull @NotEmpty private final String nam;
         
         /** Attribute NameFormat. */
         @Nullable private final String nameFormat;
@@ -159,11 +159,11 @@
         /**
          * Constructor.
          *
-         * @param nam   Attribute Name to match
+         * @param name   Attribute Name to match
          * @param format Attribute NameFormat to match
          */
-        public Candidate(@Nonnull @NotEmpty final String nam, @Nullable final String format) {
-            name = Constraint.isNotNull(StringSupport.trimOrNull(nam), "Attribute Name cannot be null or empty");
+        public Candidate(@Nonnull @NotEmpty final String name, @Nullable final String format) {
+            nam = Constraint.isNotNull(StringSupport.trimOrNull(name), "Attribute Name cannot be null or empty");
             if (Attribute.UNSPECIFIED.equals(format)) {
                 nameFormat = null;
             } else {
@@ -180,7 +180,7 @@
          * @return Attribute Name to match
          */
         @Nonnull @NotEmpty public String getName() {
-            return name;
+            return nam;
         }
 
         /**