summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2004-06-03 15:29:53 +0000
committerBenoit Foucher <benoit@zeroc.com>2004-06-03 15:29:53 +0000
commit89b13cf412c46844a9c2b1c7cb044e46e6bcd79a (patch)
tree161330b2cdcefb32099bb3e0cd652e92630e9dac /cpp/src
parentFix (diff)
downloadice-89b13cf412c46844a9c2b1c7cb044e46e6bcd79a.tar.bz2
ice-89b13cf412c46844a9c2b1c7cb044e46e6bcd79a.tar.xz
ice-89b13cf412c46844a9c2b1c7cb044e46e6bcd79a.zip
Fix
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IcePack/DescriptorParser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IcePack/DescriptorParser.cpp b/cpp/src/IcePack/DescriptorParser.cpp
index b184dc49099..5d5692f6dec 100644
--- a/cpp/src/IcePack/DescriptorParser.cpp
+++ b/cpp/src/IcePack/DescriptorParser.cpp
@@ -182,7 +182,8 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at
}
else
{
- _variables.back()[p->first] = substitute(p->second);
+ string v = substitute(p->second);
+ _variables.back()[p->first] = v;
}
}
@@ -370,7 +371,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at
}
ObjectDescriptor object;
- object.type = getAttributeValue(attrs, "type");
+ object.type = getAttributeValueWithDefault(attrs, "type", "");
object.proxy = _communicator->stringToProxy(getAttributeValue(attrs, "identity") + "@" + _currentAdapter.id);
object.adapterId = _currentAdapter.id;
_currentAdapter.objects.push_back(object);