Help resolving issue RESTWS-705

Hi, I have fixed RESTWS-705. Appreciate if someone can review the pull request. Thank you.

I have left a comment on you PR thread.

Alryt. let me also do some review

Thanks… i have update the commit message to more meaningful one

Were you able to review the code ?