From 829c323170425680b208387bd95a168894c3e49f Mon Sep 17 00:00:00 2001
From: igorpojzl <59439434+igorpojzl@users.noreply.github.com>
Date: Fri, 8 Jan 2021 17:06:52 +0100
Subject: [PATCH] IDEMPIERE-4636  Cross Tenant issue Request processor (#516)

* IDEMPIERE-4636  Cross Tenant issue Request processor

* IDEMPIERE-4636  Cross Tenant issue Request processor
---
 .../main/server/org/compiere/server/RequestProcessor.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.server/src/main/server/org/compiere/server/RequestProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/RequestProcessor.java
index 3e6a603bc9..87f0e6427b 100644
--- a/org.adempiere.server/src/main/server/org/compiere/server/RequestProcessor.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/RequestProcessor.java
@@ -433,7 +433,7 @@ public class RequestProcessor extends AdempiereServer
 			+ "WHERE r.R_Status_ID=s.R_Status_ID"
 			+ " AND s.TimeoutDays > 0 AND s.Next_Status_ID > 0"
 			+ " AND r.DateLastAction+s.TimeoutDays < getDate()"
-			+ ") "
+			+ ") AND r.AD_Client_ID = ? "
 			+ "ORDER BY R_Status_ID";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -442,6 +442,7 @@ public class RequestProcessor extends AdempiereServer
 		try
 		{
 			pstmt = DB.prepareStatement (sql, null);
+			pstmt.setInt(1, m_model.getAD_Client_ID());
 			rs = pstmt.executeQuery ();
 			while (rs.next ())
 			{
@@ -494,7 +495,8 @@ public class RequestProcessor extends AdempiereServer
 			+ "AND EXISTS ("
 				+ "SELECT * FROM R_Group g "
 				+ "WHERE g.R_Group_ID=r.R_Group_ID"
-				+ " AND (g.M_BOM_ID IS NOT NULL OR g.M_ChangeNotice_ID IS NOT NULL)	)";
+				+ " AND (g.M_BOM_ID IS NOT NULL OR g.M_ChangeNotice_ID IS NOT NULL)	)"
+			+ " AND r.AD_CLient_ID = ? ";
 		//
 		int count = 0;
 		int failure = 0;
@@ -504,6 +506,7 @@ public class RequestProcessor extends AdempiereServer
 		try
 		{
 			pstmt = DB.prepareStatement (sql, null);
+			pstmt.setInt(1, m_model.getAD_Client_ID());
 			rs = pstmt.executeQuery ();
 			while (rs.next ())
 			{