# HG changeset patch # User Sebastien Jodogne # Date 1392390764 -3600 # Node ID 3596177682a94fb02e9449ff926e41cbedc04c9a # Parent 9b15028ddc1b9c674082f9b627a2931e44c13525 fix diff -r 9b15028ddc1b -r 3596177682a9 OrthancServer/Internals/FindScp.cpp --- a/OrthancServer/Internals/FindScp.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/Internals/FindScp.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -95,7 +95,7 @@ *responseIdentifiers = NULL; return; } - + if (responseCount <= static_cast(data.answers_.GetSize())) { response->DimseStatus = STATUS_Pending; diff -r 9b15028ddc1b -r 3596177682a9 OrthancServer/Internals/MoveScp.cpp --- a/OrthancServer/Internals/MoveScp.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/Internals/MoveScp.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -82,6 +82,7 @@ try { data.iterator_.reset(data.handler_->Handle(data.target_, data.input_)); + if (data.iterator_.get() == NULL) { // Internal error! diff -r 9b15028ddc1b -r 3596177682a9 OrthancServer/OrthancFindRequestHandler.cpp --- a/OrthancServer/OrthancFindRequestHandler.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/OrthancFindRequestHandler.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -210,6 +210,10 @@ value = resource.get(tag, Json::arrayValue).get("Value", "").asString(); result.SetValue(query.GetElement(i).GetTag(), value); } + else + { + result.SetValue(query.GetElement(i).GetTag(), ""); + } } } diff -r 9b15028ddc1b -r 3596177682a9 OrthancServer/OrthancMoveRequestHandler.cpp --- a/OrthancServer/OrthancMoveRequestHandler.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/OrthancMoveRequestHandler.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -139,7 +139,6 @@ ResourceType level = StringToResourceType(levelTmp->AsString().c_str()); - /** * Lookup for the resource to be sent. **/