Fixed a bug about the missing eIdentifier attribute

csgf · Sep 22, 2014 · 8f4bd42 · 8f4bd42
1 parent cb900cf
commit 8f4bd42
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/docroot/WEB-INF/ext-impl/src/com/liferay/portlet/login/action/STORKAction.java b/docroot/WEB-INF/ext-impl/src/com/liferay/portlet/login/action/STORKAction.java
@@ -323,7 +323,7 @@ public void processAction(ActionMapping mapping, ActionForm form, PortletConfig
                 for (String attrMap : storkUserMapping.keySet()) {
                     PersonalAttribute attr = new PersonalAttribute();
                     attr.setName(storkUserMapping.get(attrMap));
-                    if (attrMap.equals(storkMandatoryAttr) || storkUserMapping.get(attrMap).equals("eIdentifier")) {
+                    if (attrMap.equals(storkMandatoryAttr) && storkUserMapping.get(attrMap).equals("eIdentifier")) {
                         attr.setIsRequired(true);
                         eIdentifier=true;
                         _log.debug("Attribute " + attrMap + " mapped in " + storkUserMapping.get(attrMap) + " is required");
@@ -332,13 +332,8 @@ public void processAction(ActionMapping mapping, ActionForm form, PortletConfig
                             attr.setIsRequired(true);
                             _log.debug("Attribute " + attrMap + " mapped in " + storkUserMapping.get(attrMap) + " is required");
                         } else {
-                            if (attrMap.equals(storkMandatoryAttr)) {
-                                attr.setIsRequired(true);
-                                _log.debug("Attribute " + attrMap + " mapped in " + storkUserMapping.get(attrMap) + " is required");
-                            } else {
-                                attr.setIsRequired(false);
-                                _log.debug("Attribute " + attrMap + " mapped in " + storkUserMapping.get(attrMap) + " is not required");
-                            }
+                            attr.setIsRequired(false);
+                            _log.debug("Attribute " + attrMap + " mapped in " + storkUserMapping.get(attrMap) + " is not required");
 
                         }
                     }