propagate from branch 'i2p.i2p' (head 34802d93f1d32368153a6769608d8e1046d0d117)

to branch 'i2p.i2p.str4d.test2' (head 0981aa4b9874c1752456cbf381aadc2fe829d57b)

apps/BOB/BOB.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core" />
+    <orderEntry type="module" module-name="ministreaming" />
+  </component>
+</module>

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

@@ -143,6 +143,7 @@ public class BOB implements Runnable, ClientApp {
 	 * Stop BOB gracefully
 	 * @deprecated unused
 	 */
+	@Deprecated
 	public synchronized static void stop() {
 		if (_bob != null)
 			_bob.shutdown(null);

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

@@ -910,6 +910,8 @@ public class DoCMDS implements Runnable {
 
 								} else if (Command.equals(C_getnick)) {
 									// Get the NamedDB to work with...
+									boolean nsfail = false;
+
 									try {
 										database.getReadLock();
 									} catch (Exception ex) {
@@ -920,6 +922,7 @@ public class DoCMDS implements Runnable {
 										ns = true;
 									} catch (RuntimeException b) {
 										try {
+											nsfail = true;
 											nns(out);
 										} catch (Exception ex) {
 											try {
@@ -932,7 +935,7 @@ public class DoCMDS implements Runnable {
 									}
 
 									database.releaseReadLock();
-									if (ns) {
+									if (ns && !nsfail) {
 										try {
 											rlock();
 										} catch (Exception e) {

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

@@ -36,6 +36,7 @@ import net.i2p.util.Log;
  * @author sponge
  * @deprecated incomplete, unused
  */
+@Deprecated
 public class UDPIOthread implements I2PSessionListener, Runnable {
 
 	private final NamedDB info;