Potentially wrong optimization when clipping a single geometry in GeometryCollection

the following code in org.geotools.renderer.geom.GeometryCollection.clip(Clipper) seems to be buggy. When zooming in very closely it caused a wrong styled to be applied.

-> there should have been only a tiny fragment of a river visible, but the whole screen appeared blue, while the river fragment was painted brown

if (clipCount == 1) {
// If there is only one geometry left, returns this particular geometry as
// an optimisation. It force us to copy the style, otherwise the geometry
// will not be correctly rendered. REVISIT: is it the right thing to do?
final Geometry clipped = clips[0];
if (clipped.getStyle() == null)

return clipped;
}

When this code is commented out - it works correctly.

The hard part of the problem is to figure out why the land and river colors are interchanged. Once this reason has been figured out, there is some change that the fix would be straightforward.