Review request for JDK-8025197

[Hannes Wallnoefer]

Please review my patch for https://bugs.openjdk.java.net/browse/JDK-8025197:

http://cr.openjdk.java.net/~hannesw/8025197/

Thanks,
Hannes