[TRAFODION-1720] rework, fix a bug in it
[TRAFODION-1720] rework, fix a bug in it

robertamarton/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,rlugojr/incubator-trafodion,robertamarton/incubator-trafodion,mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,robertamarton/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion,robertamarton/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion,robertamarton/incubator-trafodion,rlugojr/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,mashengchen/incubator-trafodion,mashengchen/incubator-trafodion,robertamarton/incubator-trafodion,robertamarton/incubator-trafodion,rlugojr/incubator-trafodion,rlugojr/incubator-trafodion