Commit efa3686a authored by michael.simon's avatar michael.simon
Browse files

dont process groups for attribute source if group_key is not set

parent 4b9f435f
......@@ -71,7 +71,7 @@ public abstract class AbstractAttributeSourceWorkflow implements AttributeSource
if (prop.readPropOrNull("group_key") != null)
groupKey = prop.readPropOrNull("group_key");
else
groupKey = "group";
groupKey = null;
if (prop.readPropOrNull("group_separator") != null)
groupSeparator = prop.readPropOrNull("group_separator");
......@@ -138,7 +138,7 @@ public abstract class AbstractAttributeSourceWorkflow implements AttributeSource
auditor.logAction("as-workflow", "CREATE VALUE (String)", key, "", AuditStatus.SUCCESS);
asValue = (ASUserAttrValueStringEntity) asValueDao.persist(asValue);
if (key.equals(groupKey)) {
if (groupKey != null && key.equals(groupKey)) {
processGroups(asValue);
}
}
......@@ -156,7 +156,7 @@ public abstract class AbstractAttributeSourceWorkflow implements AttributeSource
auditor.logAction("as-workflow", "DELETE VALUE", key, "", AuditStatus.SUCCESS);
asValueDao.delete(asValue);
if (key.equals(groupKey)) {
if (groupKey != null && key.equals(groupKey)) {
processGroups(null);
}
......@@ -179,7 +179,7 @@ public abstract class AbstractAttributeSourceWorkflow implements AttributeSource
changed = true;
}
if (key.equals(groupKey)) {
if (groupKey != null && key.equals(groupKey)) {
changed |= processGroups(asStringValue);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment