Bug#1955 - Avoid the bug condition in XSQL

Change-Id: I15c8c409ca6bc9aa7c147cdaaa7deca6e640bdcc
Signed-off-by: Sharon Aicler <saichler@cisco.com>