7 files changed, 16 insertions, 53 deletions
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index 080e9b8bc1c..474ac331d4d 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -440,15 +440,6 @@ AdminI::shutdownNode(const string& name, const Current&)
     }
 }
 
-void
-AdminI::removeNode(const string& name, const Current&)
-{
-    //
-    // Remove the node.
-    //
-    _database->removeNode(name);
-}
-
 string
 AdminI::getNodeHostname(const string& name, const Current&) const
 {
diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h
index 33e2f3ec0e7..20d9aece5a0 100644
--- a/cpp/src/IceGrid/AdminI.h
+++ b/cpp/src/IceGrid/AdminI.h
@@ -59,7 +59,6 @@ public:
 
     virtual bool pingNode(const std::string&, const Ice::Current&) const;
     virtual void shutdownNode(const std::string&, const Ice::Current&);
-    virtual void removeNode(const std::string&, const Ice::Current&);
     virtual std::string getNodeHostname(const std::string&, const Ice::Current&) const;
     virtual Ice::StringSeq getAllNodeNames(const ::Ice::Current&) const;
 
diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 2b788edafa8..c48b80a7c81 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -151,10 +151,6 @@ command
 {
     parser->shutdownNode($3);
 }
-| ICE_GRID_NODE ICE_GRID_REMOVE strings ';'
-{
-    parser->removeNode($3);
-}
 | ICE_GRID_NODE ICE_GRID_LIST ';'
 {
     parser->listAllNodes();
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 79513d0131f..af3f62da8e9 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -83,8 +83,6 @@ Parser::usage()
 	"\n"
 	"node list                   List all registered nodes.\n"
 	"node ping NAME              Ping node NAME.\n"
-        "node remove NAME            Remove the servers deployed on node NAME and\n"
-        "                            the node NAME.\n"
 	"node shutdown NAME          Shutdown node NAME.\n"
 	"\n"
         "server list                 List all registered servers.\n"
@@ -552,25 +550,6 @@ Parser::shutdownNode(const list<string>& args)
 }
 
 void
-Parser::removeNode(const list<string>& args)
-{
-    if(args.size() != 1)
-    {
-	error("`node remove' requires exactly one argument\n(`help' for more info)");
-	return;
-    }
-
-    try
-    {
-	_admin->removeNode(args.front());
-    }
-    catch(const Ice::Exception& ex)
-    {
-	exception(ex);
-    }
-}
-
-void
 Parser::listAllNodes()
 {
     try
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp
index 78bb60155c0..4f7a2b5e73e 100644
--- a/cpp/src/IceGrid/Topics.cpp
+++ b/cpp/src/IceGrid/Topics.cpp
@@ -52,20 +52,20 @@ public:
 	_topic(topic),
 	_observer(observer),
 	_serial(serial)
-    {	
-    }
+	{	
+	}
 
     void
     ice_response()
-    {
-	_topic->subscribe(_observer, _serial);
-    }
+	{
+	    _topic->subscribe(_observer, _serial);
+	}
 
     void
     ice_exception(const Ice::Exception&)
-    {
-	// Ignore
-    }
+	{
+	    // Ignore
+	}
 
 private:
 
@@ -90,9 +90,7 @@ void
 NodeObserverTopic::nodeUp(const NodeDynamicInfo& info, const Ice::Current& current)
 {
     Lock sync(*this);
-
     _nodes.insert(make_pair(info.name, info));
-
     _publisher->nodeUp(info);
 }
 
@@ -100,11 +98,11 @@ void
 NodeObserverTopic::nodeDown(const string& name, const Ice::Current&)
 {
     Lock sync(*this);
-
-    assert(_nodes.find(name) != _nodes.end());
-    _nodes.erase(name);
-
-    _publisher->nodeDown(name);
+    if(_nodes.find(name) != _nodes.end())
+    {
+	_nodes.erase(name);
+	_publisher->nodeDown(name);
+    }
 }
 
 
diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp
index 877afeb2c80..8403734f1df 100644
--- a/cpp/src/IcePack/Parser.cpp
+++ b/cpp/src/IcePack/Parser.cpp
@@ -822,9 +822,9 @@ IcePack::Parser::addServer(const list<string>& args)
 void
 IcePack::Parser::updateServer(const list<string>& args)
 {
-    if(args.size() < 3)
+    if(args.size() < 2)
     {
-	error("`server add' requires at least three arguments\n(`help' for more info)");
+	error("`server update' requires at least two arguments\n(`help' for more info)");
 	return;
     }
 
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 0fa5497e1f6..31242aa7267 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -70,7 +70,7 @@ CPPFLAGS	:= $(CPPFLAGS) -I.. -DICE_STORM_API_EXPORTS $(READLINE_FLAGS)
 ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
 SLICE2CPPFLAGS	:= --checksum --ice --dll-export ICE_STORM_API --include-dir IceStorm $(SLICE2CPPFLAGS)
 LINKWITH	:= -lIce -lIceUtil
-SVCLINKWITH	:= -lIceBox -lFreeze -lIce -lIceUtil
+SVCLINKWITH	:= -lFreeze -lIceBox -lIce -lIceUtil
 
 $(libdir)/$(LIBFILENAME): $(OBJS)
 	rm -f $@