Author: markt
Date: Mon Sep 9 20:20:43 2013
New Revision: 1521277
URL: http://svn.apache.org/r1521277
Log:
Fix circular logic as per rjung's suggestion
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1521276
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java?rev=1521277&r1=1521276&r2=1521277&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java Mon
Sep 9 20:20:43 2013
@@ -36,7 +36,10 @@ public class HttpMessages {
private static final Map<Locale,HttpMessages> instances =
new ConcurrentHashMap<Locale, HttpMessages>();
- private static final HttpMessages DEFAULT =
getInstance(Locale.getDefault());
+ private static final HttpMessages DEFAULT = new HttpMessages(
+ StringManager.getManager("org.apache.tomcat.util.http.res",
+ Locale.getDefault()));
+
// XXX move message resources in this package
private final StringManager sm;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
