From 0e58458114f342b21e8a73357e9b0e6b015e4651 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 1 Dec 2021 02:44:24 +0100
Subject: [PATCH] IDEMPIERE-5006 [Info Window] - MInfoProcess & MInfoRelated
 cached incorrectly (#1015)

---
 org.adempiere.base/src/org/compiere/model/MInfoWindow.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MInfoWindow.java b/org.adempiere.base/src/org/compiere/model/MInfoWindow.java
index 6c705129a9..506e149175 100644
--- a/org.adempiere.base/src/org/compiere/model/MInfoWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/MInfoWindow.java
@@ -34,7 +34,7 @@ import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Util;
-import org.idempiere.cache.ImmutableIntPOCache;
+import org.idempiere.cache.ImmutablePOCache;
 import org.idempiere.cache.ImmutablePOSupport;
 
 /**
@@ -51,7 +51,7 @@ public class MInfoWindow extends X_AD_InfoWindow implements ImmutablePOSupport
 	private static final long serialVersionUID = 6723480469706009814L;
 
 	/**	Cache						*/
-	private static ImmutableIntPOCache<Integer,MInfoWindow> s_cache = new ImmutableIntPOCache<Integer,MInfoWindow>(Table_Name, 20);
+	private static ImmutablePOCache<String,MInfoWindow> s_cache = new ImmutablePOCache<String,MInfoWindow>(Table_Name, 20);
 	
 	/**
 	 * 	Standard Constructor
@@ -124,7 +124,7 @@ public class MInfoWindow extends X_AD_InfoWindow implements ImmutablePOSupport
 	 */
 	public static MInfoWindow getInfoWindow(int AD_InfoWindow_ID) {
 		if (AD_InfoWindow_ID > 0) {
-			Integer key = Integer.valueOf(AD_InfoWindow_ID);
+			String key = String.valueOf(AD_InfoWindow_ID) + "|" + Env.getAD_Role_ID(Env.getCtx());
 			MInfoWindow infoWin =  s_cache.get(key);
 			if (infoWin != null)
 				return infoWin;