tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1188305 - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Date Mon, 24 Oct 2011 19:13:42 GMT
Author: markt
Date: Mon Oct 24 19:13:41 2011
New Revision: 1188305

URL: http://svn.apache.org/viewvc?rev=1188305&view=rev
Log:
Add missing i18n lookups

Modified:
    tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1188305&r1=1188304&r2=1188305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Mon Oct 24 19:13:41 2011
@@ -2193,14 +2193,16 @@ public class WebXml {
                     if (!before.equals(WebXml.ORDER_OTHERS) &&
                             order.contains(before) &&
                             order.indexOf(before) < order.indexOf(name)) {
-                        throw new IllegalArgumentException(sm.getString(""));
+                        throw new IllegalArgumentException(
+                                sm.getString("webXml.mergeConflictOrder"));
                     }
                 }
                 for (String after : fragment.getAfterOrdering()) {
                     if (!after.equals(WebXml.ORDER_OTHERS) &&
                             order.contains(after) &&
                             order.indexOf(after) > order.indexOf(name)) {
-                        throw new IllegalArgumentException();
+                        throw new IllegalArgumentException(
+                                sm.getString("webXml.mergeConflictOrder"));
                     }
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message