From 848ce5a0c75fde9a5d2b541df749367dc0ebde7e Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Mon, 24 Jul 2006 12:53:25 +0000
Subject: Fixed bug 1248.

---
 cpp/src/IceGrid/Database.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'cpp/src/IceGrid/Database.cpp')

diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index bb7e5a1e86f..4b680e1ca77 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -50,10 +50,15 @@ public:
 	assert(false);
     }
 
-    virtual Ice::ObjectPrx 
+    virtual Ice::ObjectPrx
     getDirectProxy(const Ice::Current& current) const
     {
-	return _database->getAdapterDirectProxy(current.id.name);
+	Ice::ObjectPrx proxy = _database->getAdapterDirectProxy(current.id.name);
+	if(!proxy)
+	{
+	    throw Ice::ObjectNotExistException(__FILE__, __LINE__);
+	}
+	return proxy;
     }
 
     virtual void 
-- 
cgit v1.2.3