dgraham 2003/03/23 20:39:35
Modified: src/share/org/apache/struts/util RequestUtils.java
Log:
Code cleanup.
Revision Changes Path
1.95 +13 -7
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- RequestUtils.java 18 Mar 2003 04:13:06 -0000 1.94
+++ RequestUtils.java 24 Mar 2003 04:39:35 -0000 1.95
@@ -874,15 +874,19 @@
// Locate and return the specified property
try {
return (PropertyUtils.getProperty(bean, property));
+
} catch (IllegalAccessException e) {
saveException(pageContext, e);
throw new JspException(messages.getMessage("lookup.access", property,
name));
+
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
- if (t == null)
+ if (t == null) {
t = e;
+ }
saveException(pageContext, t);
throw new JspException(messages.getMessage("lookup.target", property,
name));
+
} catch (NoSuchMethodException e) {
saveException(pageContext, e);
throw new JspException(messages.getMessage("lookup.method", property,
name));
@@ -1222,8 +1226,9 @@
+ iae.getMessage());
}
- if (multipartHandler != null)
+ if (multipartHandler != null) {
return multipartHandler;
+ }
}
return multipartHandler;
@@ -1904,8 +1909,9 @@
errors.add(ActionErrors.GLOBAL_ERROR, new ActionError((String)
value));
} else if (value instanceof String[]) {
String keys[] = (String[]) value;
- for (int i = 0; i < keys.length; i++)
+ for (int i = 0; i < keys.length; i++) {
errors.add(ActionErrors.GLOBAL_ERROR, new ActionError(keys[i]));
+ }
} else if (value instanceof ErrorMessages) {
String keys[] = ((ErrorMessages) value).getErrors();
if (keys == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
