Some refactoring and minor improvements - Removing redundant null checks etc.

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