Merge remote branch 'origin/V7_dev'

diff --git a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
index 6f8171471b32b9eb73d88bdab5112f7b1652551c..80582dbfe4d5c5ecbc27af45fb45500328f623f6 100644 (file)
--- a/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
+++ b/src/PVServerService/ServiceLoader/PVServer_ServiceLoader.cxx
@@ -52,7 +52,9 @@ std::string PVServer_ServiceLoader::findOrLoadService(const char * containerName
 
 std::string PVServer_ServiceLoader::findService(const char * containerName)
 {
-  std::string path = std::string(containerName) + "/PVSERVER";
+  std::string path = "/Containers";
+  path += containerName;
+  path += "/PVSERVER";
   CORBA::Object_ptr obj = _ns->Resolve(path.c_str());
   if(!CORBA::is_nil(obj))
     {