merge wrt-plugins-tizen_0.2.0-2

[profile/ivi/wrt-plugins-tizen.git] / src / platform / API / Messaging / MessageFilterValidator.cpp

diff --git a/src/platform/API/Messaging/MessageFilterValidator.cpp b/src/platform/API/Messaging/MessageFilterValidator.cpp
index 0d45373..694d5dc 100755 (executable)
--- a/src/platform/API/Messaging/MessageFilterValidator.cpp
+++ b/src/platform/API/Messaging/MessageFilterValidator.cpp
@@ -100,6 +100,9 @@ namespace TizenApis {
                }
 
                bool MessageFilterValidator::validateAttributeRange(std::string& attrName, Api::Tizen::AnyPtr& initialValue, Api::Tizen::AnyPtr& endValue, int depth){
+                       if(initialValue == NULL || endValue == NULL)
+                               return false;
+
                        bool retVal = false;
 
                        if(attrName.compare(MessageFilterValidatorFactory::ATTRIBUTE_TIMESTAMP)!=0){
@@ -150,19 +153,18 @@ namespace TizenApis {
                }
 
                bool MessageFilterValidator::validateAttribute(std::string& attrName, Api::Tizen::MatchFlag& matchFlag,
-                               Api::Tizen::AnyArrayPtr& values, int depth){
+                               Api::Tizen::AnyPtr& matchValue, int depth){
                        bool retBool = false;
 
-                       AnyArray::iterator iter;
-                       for(iter=values->begin(); iter!=values->end(); iter++){
-                               AnyPtr value = *iter;
-                               if(validateAttributeEach(attrName, matchFlag, value, depth) == false){
-                                       MsgLogWanning(">>>[Warning] attrName:[" << attrName << "] is invalid value:[" << value->toString() << "]");
-                                       return false;
-                               }
+                       if(matchValue == NULL)
+                               return false;
+
+                       if(validateAttributeEach(attrName, matchFlag, matchValue, depth) == false){
+                               MsgLogWanning(">>>[Warning] attrName:[" << attrName << "] is invalid value:[" << matchValue->toString() << "]");
+                               return false;
                        }
 
-                       retBool = FilterValidator::validateAttribute(attrName, matchFlag, values, depth);
+                       retBool = FilterValidator::validateAttribute(attrName, matchFlag, matchValue, depth);
                        LogDebug(">>> retBool:" << retBool);
                        return retBool;
                }