# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1650905685 -7200
# Node ID c8cdf5163cd23ca2fd6cb8e2a5ae6f645cddc30c
# Parent  63bf8fb86daedf4a0bbd3617bb12680d0081e609
cppcheck

diff -r 63bf8fb86dae -r c8cdf5163cd2 OrthancServer/Sources/ServerContext.cpp
--- a/OrthancServer/Sources/ServerContext.cpp	Mon Apr 25 18:38:20 2022 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Mon Apr 25 18:54:45 2022 +0200
@@ -2343,12 +2343,9 @@
       && (dicomAsJson != NULL))
     {
       
-      if (mainDicomTags.GetSize() > 0)
-      {
-        resource.tags_.Merge(mainDicomTags);
-      }
+      resource.tags_.Merge(mainDicomTags);
 
-      if (dicomAsJson != NULL && dicomAsJson->isObject())
+      if (dicomAsJson->isObject())
       {
         resource.tags_.FromDicomAsJson(*dicomAsJson);
       }