Router: Do not checkin: find out whether clienttps is null and for how long

build.xml

@@ -1083,13 +1083,13 @@
                 </or>
             </condition>
         </fail>
-        <fail message="Non-zero build number: ${i2p.build.number}" >
+        <!--<fail message="Non-zero build number: ${i2p.build.number}" >
             <condition>
                 <not>
                     <equals arg1="${i2p.build.number}" arg2="0"/>
                 </not>
             </condition>
-        </fail>
+        </fail>-->
         <fail message="Non-empty extra build: ${build.extra}" >
             <condition>
                 <not>

router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java

@@ -47,7 +47,7 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
         // all createRateStat in TunnelDispatcher
 
         if (_client != null) {
-            TunnelPoolSettings clienttps = _context.tunnelManager().getInboundSettings(_client);
+            TunnelPoolSettings clienttps = getTunnelPoolSettings(_client);
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Initializing client (nickname: "
                            + clienttps.getDestinationNickname()
@@ -63,6 +63,21 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
         }
 
     }
+
+    public TunnelPoolSettings getTunnelPoolSettings(Hash _client) {
+        TunnelPoolSettings clienttps = _context.tunnelManager().getInboundSettings(_client);
+        int i = 0;
+        while (clienttps == null) {
+            i++;
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ie) {}
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Waiting for tunnel settings for " + _client.toBase32() + " (" + i*100 + " milliseconds)");
+            clienttps = _context.tunnelManager().getInboundSettings(_client);
+        }
+        return clienttps;
+    }
     
     public void distribute(I2NPMessage msg, Hash target) {
         distribute(msg, target, null);