Merge fix for RIVER-425 from 2.2 branch over to trunk.

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