PDFBOX-2576: avoid use of non-short-circuit logic

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