From d8e83b3f72eab1d1c7f11e9507fa6756b4cd7d48 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 7 Aug 2010 14:22:33 +0000
Subject: [PATCH] 2010-08-07  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Evaluate callback is non-null.
	* src/DHTMessageTracker.cc
---
 ChangeLog                | 5 +++++
 src/DHTMessageTracker.cc | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b2ea2662..f79f4ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Evaluate callback is non-null.
+	* src/DHTMessageTracker.cc
+
 2010-08-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added IPv6 DHT. Added --dht-entry-porint6, --dht-file-path6,
diff --git a/src/DHTMessageTracker.cc b/src/DHTMessageTracker.cc
index ed15f322..2d68713c 100644
--- a/src/DHTMessageTracker.cc
+++ b/src/DHTMessageTracker.cc
@@ -98,7 +98,9 @@ DHTMessageTracker::messageArrived
         SharedHandle<DHTMessageCallback> callback = entry->getCallback();
         return std::make_pair(message, callback);
       } catch(RecoverableException& e) {
-        entry->getCallback()->onTimeout(targetNode);
+        if(!entry->getCallback().isNull()) {
+          entry->getCallback()->onTimeout(targetNode);
+        }
         return std::pair<SharedHandle<DHTResponseMessage>,
                          SharedHandle<DHTMessageCallback> >();
       }