Cloud ACL Management (cherry-pick conflict solve)

Resolve conflicts between cloud-interface, master and 1.2-rel

Change-Id: I1a6c1a8059befdcea1017c826ae77a1900a4d2db
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11943
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/MongoDB.java b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/MongoDB.java
index a1b5d47..6be3be4 100644 (file)
--- a/cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/MongoDB.java
+++ b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/MongoDB.java
@@ -183,7 +183,7 @@ public class MongoDB {
 
         if (collection.findOneAndReplace(filter, record) == null) {
 
-            Log.w("DB update failed due to no matched record!");
+            Log.w("DB updateX509CRL failed due to no matched record!");
             return false;
         }
 
@@ -274,7 +274,6 @@ public class MongoDB {
                 } else {
                     resourceMap.put(entry.getKey(), entry.getValue());
                 }
-
             }
         }