Issues/148 code list interceptor test fails on jdk1.8

cherry-pick from master branch.
Please review #148  , and merge to 1.0.x branch.

5dff6248c79efa59785cf31c291e55341fa2435b
9c22aee53fd4a89944ec55526dd82251a6a7b758