# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1449229507 -3600
# Node ID 769178f0ab2c195a82df416f6655eee5c8634cea
# Parent  579bf74f7da1e8286f059a9b1e476570be1ea9eb
Fix modality worklists server if some fields are null

diff -r 579bf74f7da1 -r 769178f0ab2c NEWS
--- a/NEWS	Thu Dec 03 10:02:16 2015 +0100
+++ b/NEWS	Fri Dec 04 12:45:07 2015 +0100
@@ -1,6 +1,8 @@
 Pending changes in the mainline
 ===============================
 
+* Fix modality worklists server if some fields are null
+
 
 Version 0.9.5 (2015/12/02)
 ==========================
diff -r 579bf74f7da1 -r 769178f0ab2c OrthancServer/Search/HierarchicalMatcher.cpp
--- a/OrthancServer/Search/HierarchicalMatcher.cpp	Thu Dec 03 10:02:16 2015 +0100
+++ b/OrthancServer/Search/HierarchicalMatcher.cpp	Fri Dec 04 12:45:07 2015 +0100
@@ -123,12 +123,12 @@
         std::auto_ptr<DicomValue> value(FromDcmtkBridge::ConvertLeafElement
                                         (*element, DicomToJsonFlags_None, encoding));
 
-        if (value->IsBinary() ||
-            value->IsNull())
+        if (value->IsBinary())
         {
           throw OrthancException(ErrorCode_BadRequest);
         }
-        else if (value->GetContent().empty())
+        else if (value->IsNull() ||
+                 value->GetContent().empty())
         {
           // This is an universal matcher
           constraints_[tag] = NULL;