Arrange code of Resource Broker.

fix typing error.
update from list::erase to list::remove.

Change-Id: If8d28d6ca391246611254a02efeb73a283ec97d4
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h b/service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h
index 0051bd3..f281811 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h
+++ b/service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h
@@ -82,8 +82,8 @@ namespace OIC
         typedef std::function<void(BROKER_STATE)> BrokerCB;
         struct BrokerRequesterInfo
         {
-            BrokerID brockerId;
-            BrokerCB brockerCB;
+            BrokerID brokerId;
+            BrokerCB brokerCB;
         };
         typedef std::shared_ptr<BrokerRequesterInfo> BrokerRequesterInfoPtr;
 

diff --git a/service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp b/service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp
index b936044..a35a820 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp
+++ b/service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp
@@ -121,10 +121,7 @@ namespace OIC
 
                 if(presenceItem->isEmptyRequester())
                 {
-                    auto iter = std::find(s_presenceList->begin(),
-                            s_presenceList->end(), presenceItem);
-                    s_presenceList->erase(iter);
-                    presenceItem.reset();
+                    s_presenceList->remove(presenceItem);
                 }
             }
         }

diff --git a/service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp b/service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp
index 956191a..470f14d 100755 (executable)
--- a/service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp
+++ b/service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp
@@ -97,8 +97,8 @@ namespace OIC
             BrokerRequesterInfoPtr newRequester;
             newRequester.reset(new BrokerRequesterInfo());
 
-            newRequester->brockerId = _id;
-            newRequester->brockerCB = _cb;
+            newRequester->brokerId = _id;
+            newRequester->brokerCB = _cb;
             requesterList->push_back(newRequester);
         }
 
@@ -115,7 +115,7 @@ namespace OIC
             std::list<BrokerRequesterInfoPtr>::iterator iter = requesterList->begin();
             for(; iter != requesterList->end(); ++iter)
             {
-                if(iter->get()->brockerId == _id)
+                if(iter->get()->brokerId == _id)
                 {
                     requesterList->erase(iter);
                     break;
@@ -166,7 +166,7 @@ namespace OIC
                 {
                     for(BrokerRequesterInfoPtr & item : * requesterList)
                     {
-                        item->brockerCB(state);
+                        item->brokerCB(state);
                     }
                 }
             }