diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java index 566120f2d0..6384bc7e85 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java @@ -150,7 +150,7 @@ public class NetSocketReader extends AbstractSocketReader { } catch (EOFException ee) { return SOCKET_CLOSED; } catch (ClassNotFoundException e) { - throw new IOException(e); + throw new IOException(e.getMessage()); } return SocketReader.MESSAGE_COMPLETE; } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/SoftEndOfStreamException.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/SoftEndOfStreamException.java index 49a0f8976b..9284268fe0 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/SoftEndOfStreamException.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/SoftEndOfStreamException.java @@ -34,16 +34,8 @@ public class SoftEndOfStreamException extends IOException { super(); } - public SoftEndOfStreamException(String message, Throwable cause) { - super(message, cause); - } - public SoftEndOfStreamException(String message) { super(message); } - public SoftEndOfStreamException(Throwable cause) { - super(cause); - } - } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java index 96993ec10b..6be0c97944 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java @@ -338,17 +338,17 @@ public class SocketUtils { } public static String chooseANic(boolean multicast) throws Exception { - Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); - while (interfaces.hasMoreElements()) { - NetworkInterface intface = interfaces.nextElement(); - if (intface.isLoopback() || (multicast && !intface.supportsMulticast())) - continue; - Enumeration inet = intface.getInetAddresses(); - if (!inet.hasMoreElements()) - continue; - String address = inet.nextElement().getHostAddress(); - return address; - } +// Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); +// while (interfaces.hasMoreElements()) { +// NetworkInterface intface = interfaces.nextElement(); +// if (intface.isLoopback() || (multicast && !intface.supportsMulticast())) +// continue; +// Enumeration inet = intface.getInetAddresses(); +// if (!inet.hasMoreElements()) +// continue; +// String address = inet.nextElement().getHostAddress(); +// return address; +// } return null; }