Merge pull request #7318

laanwj · laanwj · commit 9265e89a7778 · 2016-01-08T17:33:59.000+01:00
daa8da2 Backport: quickfix for RPC timer interface problem (Jonas Schnelli)
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
@@ -563,7 +563,7 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6
     if (timerInterfaces.empty())
         throw JSONRPCError(RPC_INTERNAL_ERROR, "No timer handler registered for RPC");
     deadlineTimers.erase(name);
-    RPCTimerInterface* timerInterface = timerInterfaces[0];
+    RPCTimerInterface* timerInterface = timerInterfaces.back();
     LogPrint("rpc", "queue run of timer %s in %i seconds (using %s)\n", name, nSeconds, timerInterface->Name());
     deadlineTimers.insert(std::make_pair(name, boost::shared_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000))));
 }

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6`
`563`	`563`	`if (timerInterfaces.empty())`
`564`	`564`	`throw JSONRPCError(RPC_INTERNAL_ERROR, "No timer handler registered for RPC");`
`565`	`565`	`deadlineTimers.erase(name);`
`566`		`- RPCTimerInterface* timerInterface = timerInterfaces[0];`
	`566`	`+ RPCTimerInterface* timerInterface = timerInterfaces.back();`
`567`	`567`	`LogPrint("rpc", "queue run of timer %s in %i seconds (using %s)\n", name, nSeconds, timerInterface->Name());`
`568`	`568`	`deadlineTimers.insert(std::make_pair(name, boost::shared_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000))));`
`569`	`569`	`}`