You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mc...@apache.org on 2011/06/04 16:16:02 UTC
svn commit: r1131408 -
/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
Author: mcucchiara
Date: Sat Jun 4 14:16:01 2011
New Revision: 1131408
URL: http://svn.apache.org/viewvc?rev=1131408&view=rev
Log:
WW-3637 - Auto reload of properties slowing down application (Check null)
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java?rev=1131408&r1=1131407&r2=1131408&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java (original)
+++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java Sat Jun 4 14:16:01 2011
@@ -777,7 +777,7 @@ public class LocalizedTextUtil {
}
private static void reloadBundles() {
- reloadBundles(ActionContext.getContext().getContextMap());
+ reloadBundles(ActionContext.getContext() != null ? ActionContext.getContext().getContextMap() : null);
}
private static void reloadBundles(Map<String, Object> context) {