*cough* (oops)

router/java/src/net/i2p/router/message/SendMessageDirectJob.java

@@ -50,7 +50,7 @@ public class SendMessageDirectJob extends JobImpl {
         _message = message;
         _targetHash = toPeer;
         _router = null;
-        if (timeoutMs <= 30) {
+        if (timeoutMs <= 30*1000) {
             _expiration = ctx.clock().now() + 30*1000;
         } else {
             _expiration = timeoutMs + ctx.clock().now();

router/java/src/net/i2p/router/message/SendTunnelMessageJob.java

@@ -85,7 +85,7 @@ public class SendTunnelMessageJob extends JobImpl {
                           new Exception("SendTunnel from"));
         }
         //_log.info("Send tunnel message " + msg.getClass().getName() + " to " + _destRouter + " over " + _tunnelId + " targetting tunnel " + _targetTunnelId, new Exception("SendTunnel from"));
-        if (timeoutMs < 30) {
+        if (timeoutMs < 30*1000) {
             _expiration = getContext().clock().now() + 30*1000;
         } else {
             _expiration = getContext().clock().now() + timeoutMs;