From 4488281069759ab1a231411e1da23ee90c57ee5a Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Thu, 19 Nov 2015 11:59:26 +0100
Subject: Fixed ICE-6889 - Added support for server.data and service.data
 variables

---
 cpp/src/IceGrid/NodeCache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpp/src/IceGrid/NodeCache.cpp')

diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 22f98a01a05..13262248983 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -47,6 +47,7 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt
         if(svc)
         {
             filename += "_" + svc->name;
+            _desc->services->push_back(svc->name);
         }
 
         PropertyDescriptorSeq& props = _desc->properties[filename];
@@ -109,12 +110,10 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt
             if(p->dbHome.empty())
             {
                 _desc->dbEnvs.push_back(new InternalDbEnvDescriptor(p->name, p->properties));
-                props.push_back(createProperty(p->name + ".LMDB.Path", dbsPath + p->name));
                 props.push_back(createProperty("Freeze.DbEnv." + p->name + ".DbHome", dbsPath + p->name));
             }
             else
             {
-                props.push_back(createProperty(p->name + ".LMDB.Path", p->dbHome));
                 props.push_back(createProperty("Freeze.DbEnv." + p->name + ".DbHome", p->dbHome));
             }
         }
@@ -932,6 +931,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
     server->activationTimeout = info.descriptor->activationTimeout;
     server->deactivationTimeout = info.descriptor->deactivationTimeout;
     server->applicationDistrib = info.descriptor->applicationDistrib;
+    server->services = Ice::StringSeq();
     if(!info.descriptor->distrib.icepatch.empty())
     {
         server->distrib = new InternalDistributionDescriptor(info.descriptor->distrib.icepatch,
-- 
cgit v1.2.3