Porting old fix for issue for StringIndexOutOfBoundsException#987

velo merged 1 commit intoOpenFeign:masterOpenFeign/querydsl:masterfrom

kamilkrzywanski:masterCopy head branch name to clipboard