Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5891] trunk/net/src
|
From: <ga...@us...> - 2012-03-26 12:28:18
|
Revision: 5891
http://jnode.svn.sourceforge.net/jnode/?rev=5891&view=rev
Author: galatnm
Date: 2012-03-26 12:28:08 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Network code clean-up.
Modified Paths:
--------------
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java
trunk/net/src/driver/org/jnode/driver/net/lance/LanceCore.java
trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java
trunk/net/src/net/org/jnode/net/ipv4/IPv4Address.java
trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java
trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlockList.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPOutChannel.java
trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java
trunk/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java
trunk/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java
trunk/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java
trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java
trunk/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java
trunk/net/src/net/org/jnode/protocol/nfs/Handler.java
trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java
trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java
trunk/net/src/test/org/jnode/test/net/URLTest.java
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -21,9 +21,7 @@
package org.jnode.driver.net.eepro100;
import java.security.PrivilegedExceptionAction;
-
import javax.naming.NameNotFoundException;
-
import org.jnode.driver.Device;
import org.jnode.driver.DriverException;
import org.jnode.driver.bus.pci.PCIBaseAddress;
@@ -248,7 +246,7 @@
// disable
regs.setReg32(SCBPort, 2);
Counter count = new Counter("chrono");
- while (((Integer) count.getValue()).intValue() <= 20)
+ while ((Integer) count.getValue() <= 20)
count.inc();
regs.setReg16(SCBCmd, SCBMaskAll);
int intr_status = regs.getReg16(SCBStatus);
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -153,7 +153,7 @@
}
public String toString() {
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
str.append("Status : ");
str.append(NumberUtils.hex(this.getStatus()));
str.append("\n");
Modified: trunk/net/src/driver/org/jnode/driver/net/lance/LanceCore.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/lance/LanceCore.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/driver/org/jnode/driver/net/lance/LanceCore.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -21,9 +21,7 @@
package org.jnode.driver.net.lance;
import java.security.PrivilegedExceptionAction;
-
import javax.naming.NameNotFoundException;
-
import org.jnode.driver.DriverException;
import org.jnode.driver.bus.pci.PCIBaseAddress;
import org.jnode.driver.bus.pci.PCIConstants;
@@ -441,25 +439,12 @@
0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 24, 25, 30, 31, 58, 76, 77, 80,
82, 88, 89, 112, 124};
- for (int i = 0; i < validVMWareLanceRegs.length; i++) {
- int csr_val = io.getCSR(validVMWareLanceRegs[i]);
- log.debug("CSR" + validVMWareLanceRegs[i] + " : " + NumberUtils.hex(csr_val, 4));
+ for (int validVMWareLanceReg : validVMWareLanceRegs) {
+ int csr_val = io.getCSR(validVMWareLanceReg);
+ log.debug("CSR" + validVMWareLanceReg + " : " + NumberUtils.hex(csr_val, 4));
}
// try to start again, not sure if this works?
io.setCSR(0, CSR0_STRT);
-
- /*
- for (int k = 0; k <= 22; k++) {
- int bcr_val = io.getBCR(k);
- log.debug("BCR" + k + " : " + NumberUtils.hex(bcr_val));
- }
-
- for (int j = 0; j <= 0x3F; j++) {
- int pci_val = device.readConfigByte(j);
- log.debug(
- "PCI" + NumberUtils.hex(j) + " : " + NumberUtils.hex(pci_val));
- }
- */
}
}
Modified: trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -127,9 +127,9 @@
public void requestCompleted(USBRequest request) {
// log.debug("Bluetooth Completed");
final byte[] data = intData.getData();
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("Data received : ");
- for (int i = 0; i < data.length; i++) {
+ for (byte aData : data) {
buffer.append(NumberUtils.hex(data[0], 2)).append(" ");
}
log.debug(buffer.toString());
Modified: trunk/net/src/net/org/jnode/net/ipv4/IPv4Address.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/IPv4Address.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/ipv4/IPv4Address.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -21,11 +21,10 @@
package org.jnode.net.ipv4;
import java.io.Serializable;
-import java.net.InetAddress;
import java.net.Inet4Address;
+import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.StringTokenizer;
-
import org.jnode.net.ProtocolAddress;
import org.jnode.net.SocketBuffer;
import org.jnode.net.ethernet.EthernetConstants;
@@ -213,8 +212,8 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- return "" + (address[0] & 0xFF) + '.' + (address[1] & 0xFF) + '.' + (address[2] & 0xFF) +
- '.' + (address[3] & 0xFF);
+ return String.valueOf(address[0] & 0xFF) + '.' + address[1] & 0xFF + '.' + address[2] &
+ 0xFF + '.' + address[3] & 0xFF;
}
/**
Modified: trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -31,10 +31,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-import org.jnode.nanoxml.XMLElement;
-
import org.apache.log4j.Logger;
+import org.jnode.nanoxml.XMLElement;
import org.jnode.net.ipv4.IPv4Address;
/**
@@ -83,11 +81,11 @@
XMLElement xml = new XMLElement();
xml.parseFromReader(reader);
List<XMLElement> children = xml.getChildren();
- for (int i = 0; i < children.size(); i++) {
- XMLElement child = (XMLElement) children.get(i);
+ for (XMLElement aChildren : children) {
+ XMLElement child = (XMLElement) aChildren;
try {
table.put(child.getStringAttribute("ethernetAddress").toUpperCase(),
- new TableEntry(child));
+ new TableEntry(child));
} catch (IllegalArgumentException ex) {
log.debug("Invalid IP address", ex);
}
Modified: trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -25,7 +25,6 @@
import java.net.Inet4Address;
import java.util.HashMap;
import java.util.Map;
-
import org.jnode.net.SocketBuffer;
import org.jnode.net.ipv4.bootp.BOOTPHeader;
@@ -217,7 +216,7 @@
if (code == MESSAGE_TYPE_OPTION) {
messageType = value[0];
} else {
- options.put(Integer.valueOf(code), value);
+ options.put(code, value);
}
}
@@ -254,7 +253,7 @@
if (code == MESSAGE_TYPE_OPTION)
return new byte[] {(byte) messageType};
else
- return (byte[]) options.get(Integer.valueOf(code));
+ return (byte[]) options.get(code);
}
/**
Modified: trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlockList.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlockList.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlockList.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -55,8 +55,7 @@
*/
public void timeout() {
// allocation free looping
- for (int i = 0; i < list.size(); i++) {
- IPv4ControlBlock aList = list.get(i);
+ for (IPv4ControlBlock aList : list) {
final TCPControlBlock cb = (TCPControlBlock) aList;
cb.timeout();
}
Modified: trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPOutChannel.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPOutChannel.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPOutChannel.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -143,8 +143,7 @@
*/
public void timeout() throws SocketException {
//allocation free looping
- for (int i = 0; i < unackedSegments.size(); i++) {
- TCPOutSegment seg = unackedSegments.get(i);
+ for (TCPOutSegment seg : unackedSegments) {
seg.timeout(tcp);
}
}
Modified: trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -21,7 +21,6 @@
package org.jnode.net.ipv4.udp;
import gnu.java.net.PlainDatagramSocketImpl;
-
import java.io.IOException;
import java.net.DatagramSocket;
import java.net.DatagramSocketImplFactory;
@@ -33,7 +32,6 @@
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Random;
-
import org.apache.log4j.Logger;
import org.jnode.driver.net.NetworkException;
import org.jnode.net.SocketBuffer;
@@ -84,7 +82,7 @@
/**
* for random listener ports
*/
- private final Integer zero = Integer.valueOf(0);
+ private final Integer zero = 0;
private final Random random = new Random();
private final int startRandom = 1024;
@@ -199,7 +197,7 @@
* @param skbuf
*/
private synchronized void deliver(UDPHeader hdr, SocketBuffer skbuf) throws SocketException {
- final Integer lport = Integer.valueOf(hdr.getDstPort());
+ final Integer lport = hdr.getDstPort();
final IPv4Header ipHdr = (IPv4Header) skbuf.getNetworkLayerHeader();
final UDPDatagramSocketImpl socket = (UDPDatagramSocketImpl) sockets.get(lport);
if (socket != null) {
@@ -224,7 +222,7 @@
* @param socket
*/
protected synchronized void bind(UDPDatagramSocketImpl socket) throws SocketException {
- Integer lport = new Integer(socket.getLocalPort());
+ Integer lport = socket.getLocalPort();
if (lport.compareTo(zero) != 0 && sockets.containsKey(lport)) {
throw new SocketException("Port already bound (" + lport + ")");
@@ -232,12 +230,12 @@
Integer ran;
while (lport.compareTo(zero) == 0) {
- ran = Integer.valueOf(random.nextInt(stopRandom) + startRandom);
+ ran = random.nextInt(stopRandom) + startRandom;
if (!sockets.containsKey(ran)) {
// Should we have one stop condition more??
lport = ran;
- socket.setLocalPort(lport.intValue());
+ socket.setLocalPort(lport);
}
}
@@ -251,7 +249,7 @@
* @param socket
*/
protected synchronized void unbind(UDPDatagramSocketImpl socket) {
- final Integer lport = Integer.valueOf(socket.getLocalPort());
+ final Integer lport = socket.getLocalPort();
if (sockets.get(lport) == socket) {
sockets.remove(lport);
}
Modified: trunk/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java
===================================================================
--- trunk/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -75,7 +75,7 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("FileSystemAttribute ");
buffer.append("transferSize:");
buffer.append(transferSize);
Modified: trunk/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java
===================================================================
--- trunk/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-
import org.acplt.oncrpc.OncRpcClient;
import org.acplt.oncrpc.OncRpcClientAuthUnix;
import org.acplt.oncrpc.OncRpcException;
@@ -242,8 +241,7 @@
public synchronized void close() throws IOException {
closed = true;
List<OncRpcException> exceptionList = new ArrayList<OncRpcException>();
- for (int i = 0; i < rpcClientPool.size(); i++) {
- OncRpcClient client = rpcClientPool.get(i);
+ for (OncRpcClient client : rpcClientPool) {
try {
client.close();
} catch (OncRpcException e) {
@@ -253,8 +251,8 @@
if (exceptionList.size() != 0) {
StringBuilder builder = new StringBuilder();
builder.append("An error occurs when the mount client close connections. Reason:");
- for (int i = 0; i < exceptionList.size(); i++) {
- builder.append(exceptionList.get(i).getMessage());
+ for (OncRpcException anExceptionList : exceptionList) {
+ builder.append(anExceptionList.getMessage());
builder.append(".");
}
throw new IOException(builder.toString());
Modified: trunk/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java
===================================================================
--- trunk/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-
import org.acplt.oncrpc.OncRpcClient;
import org.acplt.oncrpc.OncRpcClientAuthUnix;
import org.acplt.oncrpc.OncRpcException;
@@ -326,8 +325,7 @@
public synchronized void close() throws IOException {
closed = true;
List<OncRpcException> exceptionList = new ArrayList<OncRpcException>();
- for (int i = 0; i < rpcClientPool.size(); i++) {
- OncRpcClient client = rpcClientPool.get(i);
+ for (OncRpcClient client : rpcClientPool) {
try {
client.close();
} catch (OncRpcException e) {
@@ -338,8 +336,8 @@
if (exceptionList.size() != 0) {
StringBuilder builder = new StringBuilder();
builder.append("An error occurs when the mount client close connections. Reason:");
- for (int i = 0; i < exceptionList.size(); i++) {
- builder.append(exceptionList.get(i).getMessage());
+ for (OncRpcException anExceptionList : exceptionList) {
+ builder.append(anExceptionList.getMessage());
builder.append(".");
}
throw new IOException(builder.toString());
Modified: trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java
===================================================================
--- trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -25,7 +25,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.log4j.Logger;
import org.jnode.driver.ApiNotFoundException;
import org.jnode.driver.Device;
@@ -175,11 +174,10 @@
if (networkLayersEP != null) {
layers.clear();
final Extension[] extensions = networkLayersEP.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- final Extension ext = extensions[i];
+ for (final Extension ext : extensions) {
final ConfigurationElement[] elements = ext.getConfigurationElements();
- for (int j = 0; j < elements.length; j++) {
- configureLayer(layers, elements[j]);
+ for (ConfigurationElement element : elements) {
+ configureLayer(layers, element);
}
}
}
Modified: trunk/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java
===================================================================
--- trunk/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -29,7 +29,6 @@
import java.net.SocketAddress;
import java.net.SocketException;
import java.net.SocketTimeoutException;
-
import org.jnode.bootlog.BootLogInstance;
import org.jnode.driver.Device;
import org.jnode.driver.DeviceNotFoundException;
@@ -115,19 +114,19 @@
}
switch (option_id) {
case IP_TOS:
- return Integer.valueOf(tos);
+ return tos;
case SO_BINDADDR:
return laddr;
case SO_BROADCAST:
- return Boolean.valueOf(broadcast);
+ return broadcast;
case SO_RCVBUF:
- return Integer.valueOf(EthernetConstants.ETH_FRAME_LEN);
+ return EthernetConstants.ETH_FRAME_LEN;
case SO_SNDBUF:
- return Integer.valueOf(EthernetConstants.ETH_FRAME_LEN);
+ return EthernetConstants.ETH_FRAME_LEN;
case SO_TRANSMIT_IF:
return (device == null) ? null : NetworkInterface.getByName(device.getId());
case SO_TIMEOUT:
- return Integer.valueOf(timeout);
+ return timeout;
default:
return doGetOption(option_id);
}
@@ -147,12 +146,12 @@
try {
switch (option_id) {
case IP_TOS:
- tos = ((Integer) val).intValue();
+ tos = (Integer) val;
break;
case SO_BINDADDR:
throw new SocketException("Get only option: SO_BINDADDR");
case SO_BROADCAST:
- broadcast = ((Boolean) val).booleanValue();
+ broadcast = (Boolean) val;
break;
case SO_RCVBUF: /* ignore */
break;
@@ -171,7 +170,7 @@
}
break;
case SO_TIMEOUT:
- timeout = ((Integer) val).intValue();
+ timeout = (Integer) val;
break;
case SO_REUSEADDR:
// Ignored for now
Modified: trunk/net/src/net/org/jnode/protocol/nfs/Handler.java
===================================================================
--- trunk/net/src/net/org/jnode/protocol/nfs/Handler.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/protocol/nfs/Handler.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -25,7 +25,6 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.URLStreamHandler;
-
import org.acplt.oncrpc.OncRpcException;
import org.acplt.oncrpc.OncRpcPortmapClient;
import org.acplt.oncrpc.OncRpcProtocols;
@@ -47,8 +46,7 @@
client = new OncRpcPortmapClient(
InetAddress.getByName(url.getHost()), OncRpcProtocols.ONCRPC_TCP);
OncRpcServerIdent[] servers = client.listServers();
- for (int i = 0; i < servers.length; i++) {
- OncRpcServerIdent server = servers[i];
+ for (OncRpcServerIdent server : servers) {
if (server.program == 100003 && server.version > version) {
version = server.version;
}
Modified: trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java
===================================================================
--- trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -26,7 +26,6 @@
import java.net.URL;
import java.util.List;
import java.util.StringTokenizer;
-
import org.jnode.net.nfs.Protocol;
import org.jnode.net.nfs.nfs2.FileAttribute;
import org.jnode.net.nfs.nfs2.LookupResult;
@@ -85,8 +84,7 @@
}
ExportEntry exportEntry = null;
- for (int i = 0; i < exportList.size(); i++) {
- ExportEntry e = exportList.get(i);
+ for (ExportEntry e : exportList) {
if (path.startsWith(e.getDirectory())) {
if (exportEntry == null) {
exportEntry = e;
Modified: trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java
===================================================================
--- trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-
import org.jnode.net.nfs.Protocol;
import org.jnode.net.nfs.nfs2.CreateFileResult;
import org.jnode.net.nfs.nfs2.FileAttribute;
@@ -82,8 +81,7 @@
}
ExportEntry exportEntry = null;
- for (int i = 0; i < exportList.size(); i++) {
- ExportEntry e = exportList.get(i);
+ for (ExportEntry e : exportList) {
if (path.startsWith(e.getDirectory())) {
if (exportEntry == null) {
exportEntry = e;
Modified: trunk/net/src/test/org/jnode/test/net/URLTest.java
===================================================================
--- trunk/net/src/test/org/jnode/test/net/URLTest.java 2012-03-09 13:06:29 UTC (rev 5890)
+++ trunk/net/src/test/org/jnode/test/net/URLTest.java 2012-03-26 12:28:08 UTC (rev 5891)
@@ -34,7 +34,7 @@
final InputStream is = url.openConnection().getInputStream();
try {
int ch;
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
while ((ch = is.read()) >= 0) {
buf.append((char) ch);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
