bz899664
Merge pull request #387 from liweinan/bz899664

bz899664
RESTEASY-863
Merge pull request #404 from liweinan/RESTEASY-863

RESTEASY-863