Repository: olingo-odata4 Updated Branches: refs/heads/master 44ff6c95c -> fe82f525e
[OLINGO-633] Minor clean up Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/fe82f525 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/fe82f525 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/fe82f525 Branch: refs/heads/master Commit: fe82f525e4d129005b9d3534c38ee94ba4f6f77c Parents: 44ff6c9 Author: Michael Bolz <[email protected]> Authored: Wed Apr 22 09:17:56 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Wed Apr 22 09:17:59 2015 +0200 ---------------------------------------------------------------------- .../olingo/commons/core/edm/provider/EdmEnumTypeImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fe82f525/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java index 4745c65..4e2cab6 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumTypeImpl.java @@ -173,14 +173,15 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { } } - protected String constructEnumValue(final long value) + private String constructEnumValue(final long value) throws EdmPrimitiveTypeException { long remaining = value; - StringBuilder result = new StringBuilder(); + final StringBuilder result = new StringBuilder(); + final boolean flags = isFlags(); for (final EdmMember member : getMembers()) { - if (isFlags()) { - final long memberValue = Long.parseLong(member.getValue()); + final long memberValue = Long.parseLong(member.getValue()); + if (flags) { if ((memberValue & remaining) == memberValue) { if (result.length() > 0) { result.append(','); @@ -189,7 +190,6 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { remaining ^= memberValue; } } else { - final long memberValue = Long.parseLong(member.getValue()); if (value == memberValue) { return member.getName(); }
