Author: jholmes
Date: Tue Jun 14 10:44:31 2005
New Revision: 190631
URL: http://svn.apache.org/viewcvs?rev=190631&view=rev
Log:
Update error message for when value is null to specify the id of
the bean being defined.
PR: Bugzilla #27861
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/DefineTag.java
struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/LocalStrings.properties
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/DefineTag.java
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/DefineTag.java?rev=190631&r1=190630&r2=190631&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/DefineTag.java
(original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/DefineTag.java
Tue Jun 14 10:44:31 2005
@@ -234,7 +234,7 @@
}
if (value == null) {
JspException e =
- new JspException(messages.getMessage("define.null"));
+ new JspException(messages.getMessage("define.null", id));
TagUtils.getInstance().saveException(pageContext, e);
throw e;
}
@@ -246,7 +246,7 @@
inScope =
TagUtils.getInstance().getScope(toScope);
}
} catch (JspException e) {
- log.warn("toScope was invalid name so we default to PAGE_SCOPE",e);
+ log.warn("toScope was invalid name so we default to PAGE_SCOPE",
e);
}
pageContext.setAttribute(id, value, inScope);
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/LocalStrings.properties
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/LocalStrings.properties?rev=190631&r1=190630&r2=190631&view=diff
==============================================================================
---
struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/LocalStrings.properties
(original)
+++
struts/taglib/trunk/src/java/org/apache/struts/taglib/bean/LocalStrings.properties
Tue Jun 14 10:44:31 2005
@@ -1,5 +1,5 @@
cookie.get=No cookie {0} was included in this request
-define.null=Define tag cannot set a null value
+define.null=Define tag cannot set a null value for bean with id: {0}
define.value=Define tag can contain only one of name attribute, value
attribute, or body content
header.get=No header {0} was included in this request
include.destination=You must specify exactly one of forward, href, or page
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
