From d12e72aec32ee7ab59f4f2722871eeb9b142f695 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Wed, 31 May 2017 11:09:05 +0800
Subject: [PATCH] IDEMPIERE-3382 Schedule process shouldn't allow concurrent
 execution

---
 .../compiere/server/AdempiereServerMgr.java   |  9 ++++--
 .../org/compiere/web/AdempiereMonitor.java    | 28 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
index ffe640a51f..97ec29cd94 100644
--- a/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
@@ -501,8 +501,13 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
 
 		@Override
 		public void run() {
-			server.run();
-			scheduleFuture = Adempiere.getThreadPoolExecutor().schedule(this, server.getSleepMS(), TimeUnit.MILLISECONDS);
+			if (server.isSleeping()) {
+				server.run();
+				scheduleFuture = Adempiere.getThreadPoolExecutor().schedule(this, server.getSleepMS(), TimeUnit.MILLISECONDS);
+			}  else {
+				//server busy, try again after one minute
+				scheduleFuture = Adempiere.getThreadPoolExecutor().schedule(this, 60 * 1000, TimeUnit.MILLISECONDS);
+			}
 		}
 		
 		public AdempiereServer getServer() {
diff --git a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
index 50dfcd4a05..a232a31333 100644
--- a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
+++ b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
@@ -69,6 +69,7 @@ import org.compiere.model.MStore;
 import org.compiere.model.MSysConfig;
 import org.compiere.model.MSystem;
 import org.compiere.model.Query;
+import org.compiere.server.AdempiereServer;
 import org.compiere.server.AdempiereServerGroup;
 import org.compiere.server.AdempiereServerMgr;
 import org.compiere.server.AdempiereServerMgr.ServerWrapper;
@@ -268,7 +269,32 @@ public class AdempiereMonitor extends HttpServlet
 			return false;
 		}
 		//
-		server.getServer().runNow();
+		AdempiereServer serverInstance = server.getServer();
+		if (serverInstance.isSleeping())
+		{
+			serverInstance.runNow();
+		}
+		else
+		{
+			int count = 0;
+			while(!serverInstance.isSleeping() && count < 5)
+			{
+				count++;
+				try {
+					Thread.sleep(60000);
+				} catch (InterruptedException e) {
+					Thread.interrupted();
+				}				
+			}
+			if (serverInstance.isSleeping())
+				serverInstance.runNow();
+			else
+			{
+				m_message = new p();
+				m_message.addElement(new strong("Timeout waiting for server process  to be available for execution."));
+				m_message.addElement(serverID);
+			}
+		}
 		//
 		return true;
 	}	//	processRunParameter