diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 14:02:52 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 14:02:52 +0000 |
| commit | fed698d7a15486e1c01ee4e7eafe3da45d7cd803 (patch) | |
| tree | 5013a1127805e438bc76dc8f4b2f49a1c2461fea /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | Fix (diff) | |
| download | ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.tar.bz2 ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.tar.xz ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.zip | |
Improved the error message if you try to remove an object or adapter with
the admin interface and if that object or adapter was added with a
deployment descriptor.
Fixed a bug where trying to start a server managed by a node would fail if
this server was previously manually activated.
Simplified adapter direct proxy update if the adapter is an adapter that
wasn't added with a deployment descriptor.
Fixes to allow compilation on AIX.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index f9adc444e79..43b9dc0e520 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -178,7 +178,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at { error("the <server> element can only be a child of a <application> element"); } - _currentNode = _currentApplication->createNode(attributes); + _currentNode.reset(_currentApplication->createNode(attributes)); } else if(name == "server-instance") { @@ -196,11 +196,11 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } if(_currentNode.get()) { - _currentServer = _currentNode->createServer(attributes); + _currentServer.reset(_currentNode->createServer(attributes)); } else { - _currentServer = _currentTemplate->createServer(attributes); + _currentServer.reset(_currentTemplate->createServer(attributes)); } _currentCommunicator = _currentServer.get(); } @@ -212,11 +212,11 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at } if(_currentNode.get()) { - _currentServer = _currentNode->createIceBox(attributes); + _currentServer.reset(_currentNode->createIceBox(attributes)); } else { - _currentServer = _currentTemplate->createIceBox(attributes); + _currentServer.reset(_currentTemplate->createIceBox(attributes)); } _currentCommunicator = _currentServer.get(); } @@ -226,7 +226,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at { error("element <server-template> can only be a child of an <application> element"); } - _currentTemplate = _currentApplication->createServerTemplate(attributes); + _currentTemplate.reset(_currentApplication->createServerTemplate(attributes)); } else if(name == "service-instance") { @@ -245,11 +245,11 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at if(_currentServer.get()) { - _currentService = _currentServer->createService(attributes); + _currentService.reset(_currentServer->createService(attributes)); } else { - _currentService = _currentTemplate->createService(attributes); + _currentService.reset(_currentTemplate->createService(attributes)); } _currentCommunicator = _currentService.get(); } @@ -260,7 +260,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at error("element <service-template> can only be a child of an <application> element"); } - _currentTemplate = _currentApplication->createServiceTemplate(attributes); + _currentTemplate.reset(_currentApplication->createServiceTemplate(attributes)); } else if(name == "replicated-adapter") { |