[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "filename" updated.

[Commits to the Asterisk SCF project code repositories]

branch "filename" has been updated
       via  0c7312212a76b9397e5f741cc2ed797191fbce31 (commit)
      from  fed994c745cb81e08fdceb7f4cae2fcf5dfc1a05 (commit)

Summary of changes:
 server/src/Configuration.cpp           |    6 +++---
 server/test/ConfigurationComponent.cpp |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 0c7312212a76b9397e5f741cc2ed797191fbce31
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Mar 21 10:55:32 2011 -0500

    Fix problems pointed out by Brent during code review.

diff --git a/server/src/Configuration.cpp b/server/src/Configuration.cpp
index 34685c8..a17a2e4 100644
--- a/server/src/Configuration.cpp
+++ b/server/src/Configuration.cpp
@@ -50,7 +50,7 @@ typedef boost::shared_ptr<FileItemI> FileItemIPtr;
 class LoggerGeneralConfiguration
 {
 public:
-    LoggerGeneralConfiguration(LoggerGeneralGroupPtr group)
+    LoggerGeneralConfiguration(const LoggerGeneralGroupPtr &group)
         : mGroup(group) { }
     FileItemIPtr mOutputFile;
     LoggerGeneralGroupPtr mGroup;
@@ -83,12 +83,12 @@ ConfigurationGroupSeq LoggerConfigurationService::getConfiguration(const Configu
         /**
          * Internal helper function which determines what configuration items should be returned
        	 */
-       	void insertRequestedConfigurationItems(ConfigurationItemDict& requestedItems,
+       	void insertRequestedConfigurationItems(const ConfigurationItemDict& requestedItems,
        	    ConfigurationItemDict& localItems,
        	    ConfigurationItemDict& returnedItems)
        	{
        	    
-       	    for (ConfigurationItemDict::iterator requestedItem = requestedItems.begin();
+       	    for (ConfigurationItemDict::const_iterator requestedItem = requestedItems.begin();
        		 requestedItem != requestedItems.end();
        		 ++requestedItem)
        	    {
diff --git a/server/test/ConfigurationComponent.cpp b/server/test/ConfigurationComponent.cpp
index 5a09832..4757f17 100644
--- a/server/test/ConfigurationComponent.cpp
+++ b/server/test/ConfigurationComponent.cpp
@@ -40,6 +40,7 @@ void LoggingConfigurationHelper::setLogOutFile(const std::string &fileName, int
     fileItem->fileName = fileName;
     fileItem->serialNumber = serialNumber;
     generalGroup->configurationItems.insert(make_pair(FileItemName, fileItem));
+    groups.push_back(generalGroup);
     mConfigPrx->setConfiguration(groups);
 }
 
@@ -50,6 +51,7 @@ void LoggingConfigurationHelper::removeLogOutFile(const std::string &fileName)
     FileItemPtr fileItem(new FileItem);
     fileItem->fileName = fileName;
     generalGroup->configurationItems.insert(make_pair(FileItemName, fileItem));
+    groups.push_back(generalGroup);
     mConfigPrx->removeConfigurationItems(groups);
 }
 

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/logger.git