midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor - fixed an occasional NPE discover during field testing

This commit is contained in:
Heng Sin Low 2009-12-14 03:22:04 +00:00
parent 63eb54bc4e
commit eebe80ec8f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zkwebui/WEB-INF/src/org/adempiere/webui/dashboard/DashboardRunnable.java
View File

@ -100,11 +100,14 @@ public class DashboardRunnable implements Runnable, Serializable
if (serverContext == null) { if (serverContext == null) {
serverContext = ServerContext.newInstance(); serverContext = ServerContext.newInstance();
serverContext.putAll(ctx); serverContext.putAll(ctx);
} else if (!ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID).equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) { } else {
String id = ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID);
if (id == null || !id.equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) {
serverContext.clear(); serverContext.clear();
serverContext.putAll(ctx); serverContext.putAll(ctx);
} }
} }
}
dashboardPanels.get(i).refresh(template); dashboardPanels.get(i).refresh(template);
} }
@ -116,11 +119,14 @@ public class DashboardRunnable implements Runnable, Serializable
if (serverContext == null) { if (serverContext == null) {
serverContext = ServerContext.newInstance(); serverContext = ServerContext.newInstance();
serverContext.putAll(ctx); serverContext.putAll(ctx);
} else if (!ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID).equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) { } else {
String id = ctx.getProperty(SessionContextListener.SERVLET_SESSION_ID);
if (id == null || !id.equals(serverContext.getProperty(SessionContextListener.SERVLET_SESSION_ID))) {
serverContext.clear(); serverContext.clear();
serverContext.putAll(ctx); serverContext.putAll(ctx);
} }
} }
}
appDesktop.onServerPush(template); appDesktop.onServerPush(template);
} }