From 0192bca7431edd2fd5a9cf7b8883d77b286137ed Mon Sep 17 00:00:00 2001
From: Orlando Curieles <orlando.curieles@ingeint.com>
Date: Fri, 15 Oct 2021 15:47:09 -0400
Subject: [PATCH 1/2] IDEMPIERE-4988 Fix NPE on changeRole

---
 .../src/org/adempiere/webui/dashboard/DPRecentItems.java     | 3 ++-
 .../src/org/adempiere/webui/dashboard/DPRunningJobs.java     | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
index 9c39f4604b..87986462db 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
@@ -310,7 +310,8 @@ public class DPRecentItems extends DashboardPanel implements EventListener<Event
 	@Override
 	public void updateUI() {
 		refresh();
-		bxRecentItems.invalidate();
+		if (bxRecentItems != null)
+			bxRecentItems.invalidate();
 		updateDesktopReference();
 		
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
index 75e0f275f4..cdf880e179 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
@@ -224,7 +224,8 @@ public class DPRunningJobs extends DashboardPanel implements EventListener<Event
 	public void updateUI() 
 	{
 		refresh();
-		bxJobs.invalidate();
+		if (bxJobs != null)
+			bxJobs.invalidate();
 		updateDesktopReference();
 	}
 
@@ -285,4 +286,4 @@ public class DPRunningJobs extends DashboardPanel implements EventListener<Event
 			MPInstance.postOnChangedEvent(message);
 		}		
 	}
-}
\ No newline at end of file
+}

From d6d05d5fd1cda133b9d3f8b001a0112182a14f64 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Fri, 22 Oct 2021 13:27:46 +0200
Subject: [PATCH 2/2] IDEMPIERE-4988 NPE - Change Role

---
 .../src/org/adempiere/webui/dashboard/DPRecentItems.java       | 3 ++-
 .../src/org/adempiere/webui/dashboard/DPRunningJobs.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
index 87986462db..e041b878db 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
@@ -325,7 +325,8 @@ public class DPRecentItems extends DashboardPanel implements EventListener<Event
 				desktop.get().removeListener(listener);
 			
 			desktop = new WeakReference<Desktop>(getDesktop());
-			desktop.get().addListener(listener);
+			if (desktop != null && desktop.get() != null)
+				desktop.get().addListener(listener);
 		}
 	}
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
index cdf880e179..533445cff6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRunningJobs.java
@@ -239,7 +239,8 @@ public class DPRunningJobs extends DashboardPanel implements EventListener<Event
 				desktop.get().removeListener(listener);
 			
 			desktop = new WeakReference<Desktop>(getDesktop());
-			desktop.get().addListener(listener);
+			if (desktop != null && desktop.get() != null)
+				desktop.get().addListener(listener);
 		}
 	}