Mercurial > hg > orthanc

changeset 2720:db0f33b2aeeb jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 12 Jul 2018 11:34:45 +0200
parents 0bd1dfb14272 (current diff) bf77f58f3dee (diff)
children 062776ab4a21
files
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
     {
--- 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);