fix for issue #3090 and #3091
checkstyle fix for issue #3049
checkstyle fix for issue #3090 and #3091
checkstyle fix for issue #3090 and #3091
Merge pull request #3280 from serkan-ozal/fix/master/issue-3090-and-3091

fix for issue #3090 and #3091 on master branch