epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed version reporting (shows module version) now; fixed system configuration and startPVAServer user specified provider name(s)

Browse Source
This commit is contained in:
Matej Sekoranja
2013-09-02 23:17:52 +02:00
parent 5fdfaa21d0
commit 1dbf736ad2
5 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pvAccessApp/utils/configuration.cpp
View File

@@ -76,7 +76,6 @@ string Properties::getProperty(const string &key, const string &defaultValue)
return string(propertiesIterator->second);
}
_properties[key] = defaultValue;
return defaultValue;
}
@@ -335,12 +334,14 @@ string SystemConfigurationImpl::getPropertyAsString(const string &name, const st
{
return _properties->getProperty(name, string(val));
}
return _properties->getProperty(name,defaultValue);
return _properties->getProperty(name, defaultValue);
}
bool SystemConfigurationImpl::hasProperty(const string &key)
{
return _properties->hasProperty(key);
strncpy(_envParam.name,key.c_str(),key.length() + 1);
const char* val = envGetConfigParamPtr(&_envParam);
return (val != NULL) || _properties->hasProperty(key);
}
ConfigurationProviderImpl::ConfigurationProviderImpl()