Author: toad
Date: 2008-12-06 23:32:36 +0000 (Sat, 06 Dec 2008)
New Revision: 24110
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Better fix, log an error.
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-06 22:53:52 UTC (rev 24109)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-12-06 23:32:36 UTC (rev 24110)
@@ -1639,7 +1639,6 @@
private final int recommendedExtBuildNumber =
NodeStarter.RECOMMENDED_EXT_BUILD_NUMBER;
public boolean accept(File file) {
- try {
String fileName = file.getName();
if(fileName.startsWith("revocation-") &&
fileName.endsWith(".fblob.tmp"))
@@ -1651,19 +1650,26 @@
Matcher mainBuildNumberMatcher =
mainBuildNumberPattern.matcher(fileName);
if(mainBuildNumberMatcher.matches()) {
+ try {
buildNumberStr =
mainBuildNumberMatcher.group(1);
buildNumber =
Integer.parseInt(buildNumberStr);
if(buildNumber <
lastGoodMainBuildNumber)
return true;
+ } catch (NumberFormatException e) {
+ Logger.error(this, "Wierd file
in persistent temp: "+fileName);
+ return false;
+ }
} else if(extBuildNumberMatcher.matches()) {
+ try {
buildNumberStr =
extBuildNumberMatcher.group(1);
buildNumber =
Integer.parseInt(buildNumberStr);
if(buildNumber <
recommendedExtBuildNumber)
return true;
+ } catch (NumberFormatException e) {
+ Logger.error(this, "Wierd file
in persistent temp: "+fileName);
+ return false;
+ }
}
- } catch (NumberFormatException e) {
- return false;
- }
return false;
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
