Fix NPE in TCPtoI2P when a lookup fails, report the error to the stream.

Fix setkeys bug in DoCMDS, forgot to create the object before calling t's methods, which threw an NPE.

apps/BOB/nbproject/private/private.xml

@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java</file>
-        <file>file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/MUXlisten.java</file>
-    </open-files>
 </project-private>

apps/BOB/src/net/i2p/BOB/DoCMDS.java

@@ -691,6 +691,7 @@ public class DoCMDS implements Runnable {
 												try {
 													prikey = new ByteArrayOutputStream();
 													prikey.write(net.i2p.data.Base64.decode(Arg));
+													d = new Destination();
 													d.fromBase64(Arg);
 												} catch (Exception ex) {
 													Arg = "";

apps/BOB/src/net/i2p/BOB/TCPtoI2P.java

@@ -146,8 +146,14 @@ public class TCPtoI2P implements Runnable {
 				input = line.toLowerCase();
 				Destination dest = null;
 				if (input.endsWith(".i2p")) {
-					dest = I2PTunnel.destFromName(input);
-					line = dest.toBase64();
+					try {
+						dest = I2PTunnel.destFromName(input);
+						line = dest.toBase64();
+					} catch (NullPointerException npe) {
+						// Could not find the destination!?
+						Emsg("Can't find destination: " + input, out);
+						return;
+					}
 				}
 				dest = new Destination();
 				dest.fromBase64(line);

history.txt

@@ -1,3 +1,8 @@
+2010-01-30 sponge
+    * Fix NPE in TCPtoI2P when a lookup fails, report the error to the stream.
+    * Fix setkeys bug in DoCMDS, forgot to create the object before calling
+      it's methods, which threw an NPE.
+
 2010-01-29 zzz
     * build.xml: Add a debian-source target
     * Data structures:

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";