Fixes a bug I introduced with r1547719, simplifies another case

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