few line of refactoring.
Merge branch 'master' of https://github.com/mhshams/my-karaf-exp