Fixed a small logic bug in the name identifier mapping. Bugzilla #311.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1421 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/common/provider/BaseNameIdentifierMapping.java b/src/edu/internet2/middleware/shibboleth/common/provider/BaseNameIdentifierMapping.java
index 2cb77dc..ab8501b 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/provider/BaseNameIdentifierMapping.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/BaseNameIdentifierMapping.java
@@ -65,7 +65,7 @@ public abstract class BaseNameIdentifierMapping implements NameIdentifierMapping
                }
 
                String id = ((Element) config).getAttribute("id");
-               if (id != null || !id.equals("")) {
+               if (id != null && !id.equals("")) {
                        this.id = id;
                }
 
@@ -83,7 +83,7 @@ public abstract class BaseNameIdentifierMapping implements NameIdentifierMapping
 
        public void destroy() {
 
-       //nothing to do
+       // nothing to do
        }
 
        protected void verifyQualifier(SAMLNameIdentifier nameId, IdentityProvider idProv)