# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531388085 -7200
# Node ID db0f33b2aeebca339f89e71ce118652b9abef07d
# Parent  0bd1dfb14272ade8234c984b57917ce94c60c81e# Parent  bf77f58f3deeeefea512c1ec1aa05148029d4a17
merge

diff -r 0bd1dfb14272 -r db0f33b2aeeb OrthancServer/ServerContext.cpp
--- a/OrthancServer/ServerContext.cpp	Thu Jul 12 11:34:25 2018 +0200
+++ b/OrthancServer/ServerContext.cpp	Thu Jul 12 11:34:45 2018 +0200
@@ -196,7 +196,7 @@
 
   void ServerContext::SaveJobsEngine()
   {
-    LOG(INFO) << "Serializing the content of the jobs engine";
+    VLOG(1) << "Serializing the content of the jobs engine";
     
     try
     {
diff -r 0bd1dfb14272 -r db0f33b2aeeb OrthancServer/ServerIndex.cpp
--- a/OrthancServer/ServerIndex.cpp	Thu Jul 12 11:34:25 2018 +0200
+++ b/OrthancServer/ServerIndex.cpp	Thu Jul 12 11:34:45 2018 +0200
@@ -1186,7 +1186,12 @@
 
     {
       boost::mutex::scoped_lock lock(mutex_);
+
+      // Fix wrt. Orthanc <= 1.3.2: A transaction was missing, as
+      // "GetLastChange()" involves calls to "GetPublicId()"
+      Transaction transaction(*this);
       db_.GetChanges(changes, done, since, maxResults);
+      transaction.Commit(0);
     }
 
     FormatLog(target, changes, "Changes", done, since);
@@ -1199,7 +1204,12 @@
 
     {
       boost::mutex::scoped_lock lock(mutex_);
+
+      // Fix wrt. Orthanc <= 1.3.2: A transaction was missing, as
+      // "GetLastChange()" involves calls to "GetPublicId()"
+      Transaction transaction(*this);
       db_.GetLastChange(changes);
+      transaction.Commit(0);
     }
 
     FormatLog(target, changes, "Changes", true, 0);