From: Kevron Rees <tripzero.kev@gmail.com>
Date: Thu, 30 Jan 2014 21:54:25 +0000 (-0800)
Subject: false positive on activeRequests
X-Git-Tag: 0.11.801~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9325c2d58130fbd15b8bae4275d5ed6d0e66dd21;p=profile%2Fivi%2Fautomotive-message-broker.git

false positive on activeRequests
---

diff --git a/lib/listplusplus.h b/lib/listplusplus.h
index 7e9e99e..96c1b72 100644
--- a/lib/listplusplus.h
+++ b/lib/listplusplus.h
@@ -57,7 +57,7 @@ private:
 template <class T, class V>
 bool contains(T iteratable, V value)
 {
-	return (std::find(iteratable.begin(), iteratable.end(), value) != iteratable.end());
+	return iteratable.size() > 0 && (std::find(iteratable.begin(), iteratable.end(), value) != iteratable.end());
 }
 
 template <class T, class V>
diff --git a/plugins/websocket/websocketsource.cpp b/plugins/websocket/websocketsource.cpp
index 615af3c..b576765 100644
--- a/plugins/websocket/websocketsource.cpp
+++ b/plugins/websocket/websocketsource.cpp
@@ -87,7 +87,7 @@ void WebSocketSource::checkSubscriptions()
 	{
 		VehicleProperty::Property prop = queuedRequests.front();
 		queuedRequests.pop_front();
-		if (ListPlusPlus<VehicleProperty::Property>(&activeRequests).contains(prop))
+		if (contains(activeRequests,prop))
 		{
 			return;
 		}