Index: src/IceGrid/ServerCache.cpp
===================================================================
RCS file: /home/cvsroot/ice/src/IceGrid/ServerCache.cpp,v
retrieving revision 1.30
diff -r1.30 ServerCache.cpp
434,435c434,435
<     Lock sync(*this);
<     if(!_loaded.get() && !_load.get())
---
>     string application;
>     string node;
437c437,451
< 	throw ServerNotExistException();
---
> 	Lock sync(*this);
> 	if(_loaded.get())
> 	{
> 	    application = _loaded->application;
> 	    node = _loaded->node;
> 	}
> 	else if(_load.get())
> 	{
> 	    application = _load->application;
> 	    node = _load->node;
> 	}
> 	else
> 	{
> 	    throw ServerNotExistException();
> 	}
440d453
<     ServerInfo& info = _proxy ? *_loaded.get() : *_load.get();
442c455
<     LoadInfo load = _cache.getNodeCache().get(info.node)->getLoadInfoAndLoadFactor(info.application, factor);
---
>     LoadInfo load = _cache.getNodeCache().get(node)->getLoadInfoAndLoadFactor(application, factor);