Merge in fix for Glassfish-21175

Yeap the change is quite simple..will make change to this pull request.