From eebe80ec8f7d619dfa3542b895b0de773a694eb1 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 14 Dec 2009 03:22:04 +0000
Subject: [PATCH] minor - fixed an occasional NPE discover during field testing

---
 .../webui/dashboard/DashboardRunnable.java     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java b/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java
index dc29dca77a..5697981e30 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java
@@ -100,9 +100,12 @@ public class DashboardRunnable implements Runnable, Serializable
     			if (serverContext == null) {
     				serverContext = ServerContext.newInstance();	        	
     				serverContext.putAll(ctx);
-    			} else if (!ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID).equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) {
-    				serverContext.clear();
-    				serverContext.putAll(ctx);
+    			} else {
+    				String id = ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID);
+    				if (id == null || !id.equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) {
+    					serverContext.clear();
+    					serverContext.putAll(ctx);
+    				}
     			}
     		}
     		dashboardPanels.get(i).refresh(template);
@@ -116,9 +119,12 @@ public class DashboardRunnable implements Runnable, Serializable
     		if (serverContext == null) {
     			serverContext = ServerContext.newInstance();	        	
     			serverContext.putAll(ctx);
-    		} else if (!ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID).equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) {
-    			serverContext.clear();
-    			serverContext.putAll(ctx);
+    		} else {
+    			String id = ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID);
+				if (id == null || !id.equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) {
+					serverContext.clear();
+					serverContext.putAll(ctx);
+				}
     		}
     	}
     	appDesktop.onServerPush(template);