Author: toad
Date: 2005-12-07 23:58:12 +0000 (Wed, 07 Dec 2005)
New Revision: 7692
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/Version.java
Log:
291: (mandatory)
Really fix NPE.
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2005-12-07 23:54:56 UTC
(rev 7691)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2005-12-07 23:58:12 UTC
(rev 7692)
@@ -198,7 +198,7 @@
if(name == null) throw new FSParseException("No name");
myName = name;
String testnet = fs.get("testnet");
- testnetEnabled = testnet.equalsIgnoreCase("true") ||
testnet.equalsIgnoreCase("yes");
+ testnetEnabled = testnet == null ? false :
(testnet.equalsIgnoreCase("true") || testnet.equalsIgnoreCase("yes"));
if(testnetEnabled != node.testnetEnabled) {
String err = "Ignoring incompatible node "+peer+" -
peer.testnet="+testnetEnabled+"("+testnet+") but
node.testnet="+node.testnetEnabled;
Logger.error(this, err);
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-07 23:54:56 UTC (rev
7691)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-07 23:58:12 UTC (rev
7692)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 290;
+ public static final int buildNumber = 291;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 290;
+ public static final int lastGoodBuild = 291;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
