Fixed property warning. Fixed minor bug in IcePack cause by the port to

    IceXML parser.

3 files changed, 8 insertions, 2 deletions

diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 30b0621f054..30c27d721e9 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -191,7 +191,8 @@ static const string icePatchProps[] =
     "RemoveOrphaned",
     "Thorough",
     "Trace.Files",
-    "UpdatePeriod"
+    "UpdatePeriod",
+    "Directory"
 };
 
 static const string iceSSLProps[] =
diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp
index 99b77796187..1dde83c33be 100644
--- a/cpp/src/IcePack/ComponentBuilder.cpp
+++ b/cpp/src/IcePack/ComponentBuilder.cpp
@@ -442,6 +442,10 @@ IcePack::ComponentBuilder::parse(const string& xmlFile, ComponentHandler& handle
     {
         IceXML::Parser::parse(xmlFile, handler);
     }
+    catch(const IcePack::ParserDeploymentException& ex)
+    {
+	throw ex;
+    }
     catch(const IceXML::ParserException& e)
     {
 	ostringstream os;
diff --git a/cpp/src/IcePack/ServerBuilder.cpp b/cpp/src/IcePack/ServerBuilder.cpp
index 17127646df4..2002d507e16 100644
--- a/cpp/src/IcePack/ServerBuilder.cpp
+++ b/cpp/src/IcePack/ServerBuilder.cpp
@@ -597,8 +597,9 @@ IcePack::ServerBuilder::addService(const string& name, const string& descriptor,
     copy(_targets.begin(), _targets.end(), back_inserter(targets));
 
     ServiceBuilder* task = new ServiceBuilder(_nodeInfo, *this, variables, targets);
+    TaskPtr t = task;
     task->parse(toLocation(descriptor));
-    _tasks.push_back(task);
+    _tasks.push_back(t);
 }
 
 void