Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5687] trunk/net/src
|
From: <ga...@us...> - 2009-10-23 08:21:16
|
Revision: 5687
http://jnode.svn.sourceforge.net/jnode/?rev=5687&view=rev
Author: galatnm
Date: 2009-10-23 08:21:09 +0000 (Fri, 23 Oct 2009)
Log Message:
-----------
Fix some findbugs problems.
Modified Paths:
--------------
trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java
trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java
trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java
Modified: trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java 2009-10-23 07:53:39 UTC (rev 5686)
+++ trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java 2009-10-23 08:21:09 UTC (rev 5687)
@@ -561,14 +561,12 @@
final SocketBuffer skbuf = null; // rxRing.getPacket(pktLen);
try {
- // FIXME ... this always throws an NPE since skbuf is null
- if (skbuf.getSize() > 0) {
+
+ if (skbuf != null && skbuf.getSize() > 0) {
driver.onReceive(skbuf);
}
} catch (NetworkException e) {
- e.printStackTrace(); // To change body of catch statement
- // use Options | File
- // Templates.
+ e.printStackTrace();
} finally {
// FIXME
}
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2009-10-23 07:53:39 UTC (rev 5686)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2009-10-23 08:21:09 UTC (rev 5687)
@@ -177,7 +177,7 @@
for (y = 0, x = 0, sum = 0; x < eeSize; x++) {
int value = doEepromCmd((eeReadCmd | (x << 16)), 27);
eeprom[x] = value;
- sum += new Integer(value).shortValue();
+ sum += (short)value;
if (x < 3) {
hwAddrArr[y++] = (byte) value;
hwAddrArr[y++] = (byte) (value >> 8);
@@ -407,7 +407,7 @@
regs.setReg16(SCBeeprom, EE_ENB);
eepromDelay(2);
regs.setReg16(SCBeeprom, (EE_ENB & ~EE_CS));
- return NumberUtils.toUnsigned(new Integer(retVal).shortValue());
+ return NumberUtils.toUnsigned((short)retVal);
}
// --- OTHER METHODS
Modified: trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java 2009-10-23 07:53:39 UTC (rev 5686)
+++ trunk/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java 2009-10-23 08:21:09 UTC (rev 5687)
@@ -217,7 +217,7 @@
if (code == MESSAGE_TYPE_OPTION) {
messageType = value[0];
} else {
- options.put(new Integer(code), value);
+ options.put(Integer.valueOf(code), value);
}
}
@@ -254,7 +254,7 @@
if (code == MESSAGE_TYPE_OPTION)
return new byte[] {(byte) messageType};
else
- return (byte[]) options.get(new Integer(code));
+ return (byte[]) options.get(Integer.valueOf(code));
}
/**
Modified: trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java 2009-10-23 07:53:39 UTC (rev 5686)
+++ trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java 2009-10-23 08:21:09 UTC (rev 5687)
@@ -84,7 +84,7 @@
/**
* for random listener ports
*/
- private final Integer zero = new Integer(0);
+ private final Integer zero = Integer.valueOf(0);
private final Random random = new Random();
private final int startRandom = 1024;
@@ -199,7 +199,7 @@
* @param skbuf
*/
private synchronized void deliver(UDPHeader hdr, SocketBuffer skbuf) throws SocketException {
- final Integer lport = new Integer(hdr.getDstPort());
+ final Integer lport = Integer.valueOf(hdr.getDstPort());
final IPv4Header ipHdr = (IPv4Header) skbuf.getNetworkLayerHeader();
final UDPDatagramSocketImpl socket = (UDPDatagramSocketImpl) sockets.get(lport);
if (socket != null) {
@@ -232,10 +232,10 @@
Integer ran;
while (lport.compareTo(zero) == 0) {
- ran = new Integer(random.nextInt(stopRandom) + startRandom);
+ ran = Integer.valueOf(random.nextInt(stopRandom) + startRandom);
if (!sockets.containsKey(ran)) {
- // hmmm..... should we have one stop condition more??
+ // Should we have one stop condition more??
lport = ran;
socket.setLocalPort(lport.intValue());
}
@@ -251,7 +251,7 @@
* @param socket
*/
protected synchronized void unbind(UDPDatagramSocketImpl socket) {
- final Integer lport = new Integer(socket.getLocalPort());
+ final Integer lport = Integer.valueOf(socket.getLocalPort());
if (sockets.get(lport) == socket) {
sockets.remove(lport);
}
Modified: trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java
===================================================================
--- trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java 2009-10-23 07:53:39 UTC (rev 5686)
+++ trunk/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java 2009-10-23 08:21:09 UTC (rev 5687)
@@ -109,7 +109,7 @@
* @throws NoSuchProtocolException
*/
public NetworkLayer getNetworkLayer(int protocolID) throws NoSuchProtocolException {
- final NetworkLayer pt = (NetworkLayer) layers.get(new Integer(protocolID));
+ final NetworkLayer pt = (NetworkLayer) layers.get(Integer.valueOf(protocolID));
if (pt == null) {
throw new NoSuchProtocolException("protocolID " + protocolID);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
