ulfgebhardt/college
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
M.Scholz 2012-11-21 10:51:07 +01:00
parent 43c34c7bec
commit 243088fac5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ws2012/P2P/uebungen/4/src/peer/Node.java
View File

@ -31,10 +31,6 @@ public class Node {
private UDPListen udpListen;
public Node() {
<<<<<<< HEAD
// System.setProperty("java.net.preferIPv4Stack" , "true"); // optional
// IPv4 (mac, windows)
=======
System.setProperty("java.net.preferIPv4Stack" , "true"); // optional IPv4 (mac, windows)
//get a port
@ -48,7 +44,6 @@ public class Node {
}
}
>>>>>>> fixed string.split(), fixed indices
try {
channel = DatagramChannel.open();
channel.socket().bind(new InetSocketAddress("localhost", port));