CELIX-152: code refactoring

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