From afc0423beb339fa18dd22acf6e79f759dd1b5d61 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 20 Dec 2006 14:54:00 +0000
Subject: Don't add again IceBox adapter proeprties if they already exist.

---
 cpp/src/IceGrid/NodeCache.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index af59791511e..adb0feb1236 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -55,12 +55,7 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt
 	//
 	// Add the adapters and their configuration.
 	//
-	string oaPropertyPrefix = "Ice.OA.";
-	if(getMMVersion(_desc->iceVersion) < 30200)
-	{
-	    oaPropertyPrefix = "";
-	}
-
+	string oaPropertyPrefix = getMMVersion(_desc->iceVersion) < 30200 ? "" : "Ice.OA.";
 	for(AdapterDescriptorSeq::const_iterator q = desc->adapters.begin(); q != desc->adapters.end(); ++q)
 	{
 	    _desc->adapters.push_back(new InternalAdapterDescriptor(q->id, q->serverLifetime));
@@ -873,6 +868,10 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
     props.push_back(createProperty("# Server configuration"));
     props.push_back(createProperty("Ice.ServerId", info.descriptor->id));
     props.push_back(createProperty("Ice.ProgramName", info.descriptor->id));
+
+    //
+    // Add IceBox properties.
+    //
     string servicesStr;
     IceBoxDescriptorPtr iceBox = IceBoxDescriptorPtr::dynamicCast(info.descriptor);
     if(iceBox)
-- 
cgit v1.2.3