summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorBuilder.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2005-10-25 20:45:35 +0000
committerBenoit Foucher <benoit@zeroc.com>2005-10-25 20:45:35 +0000
commitd89f4f58ea4ab21661540c33f5e3481c67a758b1 (patch)
tree4f9a09fb53e573863c29b62d6e7777eb83ee8873 /cpp/src/IceGrid/DescriptorBuilder.cpp
parentFix some SRPM generation bugs, some copy commands and removed buildrequires (diff)
downloadice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.bz2
ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.xz
ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.zip
Fixed a bug where IcePatch2 couldn't be deployed and used in a new
application. Fixed deadlock. Added automatic patching after adding an application.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 0c216f1f243..a8c5eee6d52 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -530,6 +530,7 @@ ServerDescriptorBuilder::init(const ServerDescriptorPtr& desc, const XmlAttribut
_descriptor->deactivationTimeout = attrs("deactivation-timeout", "");
_descriptor->pwd = attrs("pwd", "");
_descriptor->activation = attrs("activation", "manual");
+ _descriptor->noApplicationDistrib = attrs("no-application-distrib", "false") == "true";
}
ServiceDescriptorBuilder*