No functional change, just simplify code.
Also some trailing spaces removed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542708 13f79535-47bb-0310-9956-ffa450edef68