Code Refactor. Fix code issues introduced by other enhancement.  

Signed-off-by: Pengcheng Bian <pbian@actuate.com>
Code Refactor. Fix
Code Refactor. Improve Code performance.

Signed-off-by: Pengcheng Bian <pbian@actuate.com>
Fix bug 456373 missing messages.

Signed-off-by: Pengcheng Bian <pbian@actuate.com>
Code Refactor: Check null value to avoid null pointer exception.

Signed-off-by: Pengcheng Bian <pbian@actuate.com>
Code Refactor Fix 456310

Signed-off-by: Pengcheng Bian <pbian@actuate.com>
Merge pull request #56 from TerryPCBian/master

Code Refactor