Re-work on Felix-1518
Apply Guillaume patch, Fix the potential NPE


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@807115 13f79535-47bb-0310-9956-ffa450edef68
1 file changed