Apply fix for RIVER-423 to 2.2 branch.



git-svn-id: https://svn.apache.org/repos/asf/river/jtsk/branches/2.2@1511582 13f79535-47bb-0310-9956-ffa450edef68