From d00debd2505aa9387c3922e2d87f959d3a036ab1 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Mon, 7 Apr 2014 14:05:54 -0600 Subject: [PATCH] fix Java 6 build Java 6's javac is not as smart as Java 7's when it comes to calling overloaded methods from an inner class, so we have to be more explicit. --- classpath/java/nio/channels/SocketChannel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classpath/java/nio/channels/SocketChannel.java b/classpath/java/nio/channels/SocketChannel.java index fd3cd2b36b..d1cbaddce5 100644 --- a/classpath/java/nio/channels/SocketChannel.java +++ b/classpath/java/nio/channels/SocketChannel.java @@ -185,9 +185,10 @@ public class SocketChannel extends SelectableChannel } if (a == null) { - bind(socket, 0, 0); + SocketChannel.bind(socket, 0, 0); } else { - bind(socket, a.getAddress().getRawAddress(), a.getPort()); + SocketChannel.bind + (socket, a.getAddress().getRawAddress(), a.getPort()); } } }