Author: toad
Date: 2007-06-12 23:49:05 +0000 (Tue, 12 Jun 2007)
New Revision: 13549
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Fix incorrect URI check
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2007-06-12 23:28:55 UTC (rev 13548)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2007-06-12 23:49:05 UTC (rev 13549)
@@ -200,10 +200,13 @@
if(mainJarVersion > Version.buildNumber() && mainJarFileLength
> 0) {
// Fetch it
try {
- FreenetURI mainJarURI = new FreenetURI(jarKey);
- if(mainJarURI.equals(updateManager.updateURI)) {
+ FreenetURI mainJarURI = new
FreenetURI(jarKey).setSuggestedEdition(mainJarVersion);
+
if(mainJarURI.equals(updateManager.updateURI.setSuggestedEdition(mainJarVersion)))
{
System.err.println("Fetching main jar
from "+source.userToString());
sendUOMRequestMain(source);
+ } else {
+ System.err.println("Node
"+source.userToString()+" offered us a new main jar (version
"+mainJarVersion+") but his key was different to ours:\n"+
+ "our key:
"+updateManager.updateURI+"\nhis key:"+mainJarURI);
}
} catch (MalformedURLException e) {
// Should maybe be a useralert?
