From 95d0dc041915dab430a517033d9948f7c1b843b6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 28 Jan 2013 12:50:04 +0000
Subject: [PATCH] fix BuildHandler NPE from previous checkin
---
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index c10128fe62..fecba78d69 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/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 = 6;
+ public final static long BUILD = 7;
/** for example "-test" */
public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
index 9d4c08745d..15a89a4a2f 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
@@ -866,7 +866,7 @@ class BuildHandler implements Runnable {
if (accept) {
// early request throttle check, before queueing and decryption
Hash fh = fromHash;
- if (fh == null)
+ if (fh == null && from != null)
fh = from.calculateHash();
if (fh != null && _requestThrottler.shouldThrottle(fh)) {
if (_log.shouldLog(Log.WARN))
--
GitLab