From 6d2608d6937a7b71160230388fe0eeef03feec40 Mon Sep 17 00:00:00 2001
From: bpaunescu <bogdan.paunescu@r3.com>
Date: Fri, 22 Dec 2017 21:16:27 +0000
Subject: [PATCH 1/2] ENT-1322: format new date object to work with SQLServer
 comparison between timestamp and datetime

---
 .../services/persistence/RunOnceService.kt    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt b/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt
index e986160cc1..bb652fa065 100644
--- a/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt
+++ b/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt
@@ -6,8 +6,9 @@ import net.corda.node.utilities.AffinityExecutor
 import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.persistence.NODE_DATABASE_PREFIX
 import org.hibernate.Session
+import java.text.SimpleDateFormat
 import java.time.Duration
-import java.util.*
+import java.util.Date
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
@@ -128,25 +129,27 @@ class RunOnceService(private val database: CordaPersistence, private val machine
     }
 
     private fun updateTimestamp(session: Session, mutualExclusion: MutualExclusion): Boolean {
-        val query = session.createNativeQuery("UPDATE $TABLE SET $MACHINE_NAME=:machineName, $TIMESTAMP=CURRENT_TIMESTAMP, $PID=:pid " +
-                "WHERE $ID='X' AND " +
+        val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
+        val minWaitTime = simpleDateFormat.format(Date(mutualExclusion.timestamp!!.time + waitInterval))
+        val query = session.createNativeQuery("UPDATE $TABLE SET $MACHINE_NAME = :machineName, $TIMESTAMP = CURRENT_TIMESTAMP, $PID = :pid " +
+                "WHERE $ID = 'X' AND " +
 
                 // we are master node
-                "($MACHINE_NAME=:machineName) OR " +
+                "($MACHINE_NAME = :machineName OR " +
 
                 // change master node
-                "($MACHINE_NAME!=:machineName AND " +
+                "($MACHINE_NAME != :machineName AND " +
                 // no one else has updated timestamp whilst we attempted this update
-                "$TIMESTAMP=:mutualExclusionTimestamp AND " +
+                "$TIMESTAMP = CAST(:mutualExclusionTimestamp AS DATETIME) AND " +
                 // old timestamp
-                "CURRENT_TIMESTAMP>:waitTime)", MutualExclusion::class.java)
+                "CURRENT_TIMESTAMP > CAST(:waitTime AS DATETIME)))", MutualExclusion::class.java)
 
         query.unwrap(org.hibernate.SQLQuery::class.java).addSynchronizedEntityClass(MutualExclusion::class.java)
 
         query.setParameter("pid", pid)
         query.setParameter("machineName", machineName)
         query.setParameter("mutualExclusionTimestamp", mutualExclusion.timestamp)
-        query.setParameter("waitTime", Date(mutualExclusion.timestamp!!.time + waitInterval))
+        query.setParameter("waitTime", minWaitTime)
         val returnValue = query.executeUpdate()
 
         if (returnValue != 1) {

From a320c8a11652faef0c684f0208063ea50f7db27b Mon Sep 17 00:00:00 2001
From: bpaunescu <bogdan.paunescu@r3.com>
Date: Tue, 2 Jan 2018 09:55:03 +0000
Subject: [PATCH 2/2] moved init of simpleDateFormat

---
 .../net/corda/node/services/persistence/RunOnceService.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt b/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt
index bb652fa065..a3528f8f9c 100644
--- a/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt
+++ b/node/src/main/kotlin/net/corda/node/services/persistence/RunOnceService.kt
@@ -36,6 +36,7 @@ class RunOnceService(private val database: CordaPersistence, private val machine
 
     private val log = loggerFor<RunOnceService>()
     private val running = AtomicBoolean(false)
+    private val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
 
     init {
         if (waitInterval <= updateInterval) {
@@ -129,7 +130,6 @@ class RunOnceService(private val database: CordaPersistence, private val machine
     }
 
     private fun updateTimestamp(session: Session, mutualExclusion: MutualExclusion): Boolean {
-        val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
         val minWaitTime = simpleDateFormat.format(Date(mutualExclusion.timestamp!!.time + waitInterval))
         val query = session.createNativeQuery("UPDATE $TABLE SET $MACHINE_NAME = :machineName, $TIMESTAMP = CURRENT_TIMESTAMP, $PID = :pid " +
                 "WHERE $ID = 'X' AND " +