Author: toad
Date: 2008-03-02 00:02:28 +0000 (Sun, 02 Mar 2008)
New Revision: 18316
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/support/io/BaseFileBucket.java
Log:
Use Fields.parseLong(,default) to more smoothly handle some failures
(NumberFormatException is a RuntimeException...)
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-03-01 23:56:18 UTC
(rev 18315)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-03-02 00:02:28 UTC
(rev 18316)
@@ -597,17 +597,17 @@
updateShortToString();
String tempTimeLastReceivedPacketString =
metadata.get("timeLastReceivedPacket");
if(tempTimeLastReceivedPacketString != null) {
- long tempTimeLastReceivedPacket =
Long.parseLong(tempTimeLastReceivedPacketString);
+ long tempTimeLastReceivedPacket =
Fields.parseLong(tempTimeLastReceivedPacketString, -1);
timeLastReceivedPacket =
tempTimeLastReceivedPacket;
}
String tempTimeLastConnectedString =
metadata.get("timeLastConnected");
if(tempTimeLastConnectedString != null) {
- long tempTimeLastConnected =
Long.parseLong(tempTimeLastConnectedString);
+ long tempTimeLastConnected =
Fields.parseLong(tempTimeLastConnectedString, -1);
timeLastConnected =
tempTimeLastConnected;
}
String tempTimeLastRoutableString =
metadata.get("timeLastRoutable");
if(tempTimeLastRoutableString != null) {
- long tempTimeLastRoutable =
Long.parseLong(tempTimeLastRoutableString);
+ long tempTimeLastRoutable =
Fields.parseLong(tempTimeLastRoutableString, -1);
timeLastRoutable = tempTimeLastRoutable;
}
if(timeLastConnected < 1 &&
timeLastReceivedPacket > 1)
@@ -616,7 +616,7 @@
timeLastRoutable =
timeLastReceivedPacket;
String tempPeerAddedTimeString =
metadata.get("peerAddedTime");
if(tempPeerAddedTimeString != null) {
- long tempPeerAddedTime =
Long.parseLong(tempPeerAddedTimeString);
+ long tempPeerAddedTime =
Fields.parseLong(tempPeerAddedTimeString, 0);
peerAddedTime = tempPeerAddedTime;
} else
peerAddedTime = 0;
@@ -627,13 +627,13 @@
peerAddedTime = 0;
String tempHadRoutableConnectionCountString =
metadata.get("hadRoutableConnectionCount");
if(tempHadRoutableConnectionCountString !=
null) {
- long tempHadRoutableConnectionCount =
Long.parseLong(tempHadRoutableConnectionCountString);
+ long tempHadRoutableConnectionCount =
Fields.parseLong(tempHadRoutableConnectionCountString, 0);
hadRoutableConnectionCount =
tempHadRoutableConnectionCount;
} else
hadRoutableConnectionCount = 0;
String tempRoutableConnectionCheckCountString =
metadata.get("routableConnectionCheckCount");
if(tempRoutableConnectionCheckCountString !=
null) {
- long tempRoutableConnectionCheckCount =
Long.parseLong(tempRoutableConnectionCheckCountString);
+ long tempRoutableConnectionCheckCount =
Fields.parseLong(tempRoutableConnectionCheckCountString, 0);
routableConnectionCheckCount =
tempRoutableConnectionCheckCount;
} else
routableConnectionCheckCount = 0;
Modified: trunk/freenet/src/freenet/support/io/BaseFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BaseFileBucket.java 2008-03-01
23:56:18 UTC (rev 18315)
+++ trunk/freenet/src/freenet/support/io/BaseFileBucket.java 2008-03-02
00:02:28 UTC (rev 18316)
@@ -11,6 +11,7 @@
import org.tanukisoftware.wrapper.WrapperManager;
+import freenet.support.Fields;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
import freenet.support.StringArray;
@@ -449,7 +450,7 @@
tmp = fs.get("Length");
if(tmp == null) throw new CannotCreateFromFieldSetException("No
length");
try {
- long length = Long.parseLong(tmp);
+ long length = Fields.parseLong(tmp, -1);
if(length != file.length())
throw new
CannotCreateFromFieldSetException("Invalid length: should be "+length+"
actually "+file.length()+" on "+file);
} catch (NumberFormatException e) {
