Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1307 Remove Java 6 dependencies (cause in IOException; isLoopback() on NetworkInterface)

Browse Source
This commit is contained in:
Gary Russell
2010-07-31 22:52:16 +00:00
parent ec21584793
commit 6c45f7538d
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java
View File

@@ -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;
}

8
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/SoftEndOfStreamException.java
View File

@@ -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);
}
}

22
spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java
View File

@@ -338,17 +338,17 @@ public class SocketUtils {
}
public static String chooseANic(boolean multicast) throws Exception {
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
while (interfaces.hasMoreElements()) {
NetworkInterface intface = interfaces.nextElement();
if (intface.isLoopback() || (multicast && !intface.supportsMulticast()))
continue;
Enumeration<InetAddress> inet = intface.getInetAddresses();
if (!inet.hasMoreElements())
continue;
String address = inet.nextElement().getHostAddress();
return address;
}
// Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
// while (interfaces.hasMoreElements()) {
// NetworkInterface intface = interfaces.nextElement();
// if (intface.isLoopback() || (multicast && !intface.supportsMulticast()))
// continue;
// Enumeration<InetAddress> inet = intface.getInetAddresses();
// if (!inet.hasMoreElements())
// continue;
// String address = inet.nextElement().getHostAddress();
// return address;
// }
return null;
}