Fixing server hanging issue - https://issues.apache.org/jira/browse/AIRAVATA-1072