[FELIX-1994]improve fix to handle more generic case

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@904011 13f79535-47bb-0310-9956-ffa450edef68
3 files changed