Author: markt
Date: Fri Dec 28 13:22:15 2007
New Revision: 607336
URL: http://svn.apache.org/viewvc?rev=607336&view=rev
Log:
Fix bug 43944. Fix a missing resource exception.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=607336&r1=607335&r2=607336&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Dec 28 13:22:15 2007
@@ -54,12 +54,6 @@
+1: markt,funkman, yoavs
-1:
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43944
- Use a message that exists to prevent a MissingResourceException
- http://svn.apache.org/viewvc?rev=606704&view=rev
- +1: markt,funkman, yoavs
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=42503
ServletContext.getResourceAsStream returns stale data
http://svn.apache.org/viewvc?rev=606994&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=607336&r1=607335&r2=607336&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java Fri Dec 28
13:22:15 2007
@@ -364,8 +364,8 @@
return coerce(new Short((short) ((Character) obj).charValue()));
}
- throw new IllegalArgumentException(MessageFactory.get("el.convert",
obj,
- objType));
+ throw new IllegalArgumentException(MessageFactory.get("error.convert",
+ obj, objType, "Number"));
}
protected abstract Number coerce(final String str);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=607336&r1=607335&r2=607336&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Dec 28 13:22:15 2007
@@ -145,6 +145,9 @@
<bug>43909</bug>: Make sure locale maps to wrapped ELContext. Patch
provided by Tuomas Kiviaho. (markt)
</fix>
+ <fix>
+ <bug>43944</bug>: Fix a missing resource exception. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
