SLING-3375 : patch from Timothee Maret applied, thanks a lot! Plus made method final

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