# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1543334951 -3600
# Node ID 2dfa40b9ca42b17c607c6c6f93f09ff8963d3d93
# Parent  4a38d7d4f0e074c01aa9653ee4bea950995d54f7# Parent  00504dcc996f09a843d9f5782e9e4250c3326b22
merge

diff -r 4a38d7d4f0e0 -r 2dfa40b9ca42 NEWS
--- a/NEWS	Tue Nov 27 17:08:48 2018 +0100
+++ b/NEWS	Tue Nov 27 17:09:11 2018 +0100
@@ -26,6 +26,7 @@
 Maintenance
 -----------
 
+* "SynchronousCMove" is now "true" by default
 * New modality manufacturer: "GE" for GE Healthcare EA and AW
 * Executing a query/retrieve from the REST API now creates a job
 * Fix: Closing DICOM associations after running query/retrieve from REST API
diff -r 4a38d7d4f0e0 -r 2dfa40b9ca42 OrthancServer/OrthancMoveRequestHandler.cpp
--- a/OrthancServer/OrthancMoveRequestHandler.cpp	Tue Nov 27 17:08:48 2018 +0100
+++ b/OrthancServer/OrthancMoveRequestHandler.cpp	Tue Nov 27 17:09:11 2018 +0100
@@ -238,7 +238,7 @@
                                               const std::string& originatorAet,
                                               uint16_t originatorId)
   {
-    bool synchronous = Configuration::GetGlobalBoolParameter("SynchronousCMove", false);
+    bool synchronous = Configuration::GetGlobalBoolParameter("SynchronousCMove", true);
 
     if (synchronous)
     {
diff -r 4a38d7d4f0e0 -r 2dfa40b9ca42 Resources/Configuration.json
--- a/Resources/Configuration.json	Tue Nov 27 17:08:48 2018 +0100
+++ b/Resources/Configuration.json	Tue Nov 27 17:09:11 2018 +0100
@@ -414,8 +414,11 @@
   // Whether to run DICOM C-Move operations synchronously. If set to
   // "false" (the default), each incoming C-Move request results in
   // creating a new background job. Up to Orthanc 1.3.2, the implicit
-  // behavior was to use synchronous C-Move.
-  "SynchronousCMove" : false,
+  // behavior was to use synchronous C-Move. Between Orthanc 1.4.0 and
+  // 1.4.2, the default behavior was set to asynchronous C-Move. Since
+  // Orthanc 1.4.3, the default behavior is synchronous C-Move
+  // (backward compatibility with Orthanc <= 1.3.2).
+  "SynchronousCMove" : true,
 
   // Maximum number of completed jobs that are kept in memory. A
   // processing job is considered as complete once it is tagged as