summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Simons <kevin.simons@nokia.com>2012-03-21 12:22:46 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-21 20:06:58 +0100
commit8cbfcc30a742bfc07f41d59fac1925b735f15153 (patch)
tree42f2cc8f548c055869c38d0bac72aff8d89959ae
parentaf3714eb7a29daa96ef87c5369f649f134cf2066 (diff)
Make it an error to create a notification with an empty query
Change-Id: Ib645a465b37b30a34e93717cd27c85efc8655764 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
-rw-r--r--src/daemon/jsondbephemeralpartition.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/daemon/jsondbephemeralpartition.cpp b/src/daemon/jsondbephemeralpartition.cpp
index dee0983..989748f 100644
--- a/src/daemon/jsondbephemeralpartition.cpp
+++ b/src/daemon/jsondbephemeralpartition.cpp
@@ -129,6 +129,14 @@ JsonDbWriteResult JsonDbEphemeralPartition::updateObjects(const JsonDbOwner *own
if (!mObjects.contains(object.uuid()))
action = JsonDbNotification::Create;
+ // TODO: maybe be this somewhere else so that it doesn't pollute this code
+ if (object.type() == JsonDbString::kNotificationTypeStr &&
+ object.value(JsonDbString::kQueryStr).toString().isEmpty()) {
+ result.code = JsonDbError::MissingQuery;
+ result.message = QLatin1String("Notification objects must contain a query paramater");
+ return result;
+ }
+
object.insert(JsonDbString::kOwnerStr, owner->ownerId());
object.computeVersion();
mObjects[object.uuid()] = object;