rleland 2002/11/15 23:07:07
Modified: src/share/org/apache/struts/taglib/nested
NestedPropertyHelper.java
Log:
Simplify code, if statement was always true.
Clean up JavaDoc.
Revision Changes Path
1.11 +8 -10
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java
Index: NestedPropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NestedPropertyHelper.java 16 Nov 2002 04:30:03 -0000 1.10
+++ NestedPropertyHelper.java 16 Nov 2002 07:07:07 -0000 1.11
@@ -85,7 +85,7 @@
/** Sets the passed reference to the session object, and returns any reference
* that was already there
- * @param session User's session object
+ * @param request User's request object
* @param reference New reference to put into the session
*/
public static final NestedReference setIncludeReference(HttpServletRequest
request,
@@ -124,11 +124,9 @@
/* loop all parent tags until we get one that can be nested against */
do {
namedTag = namedTag.getParent();
- if (parentTag == null) {
- if (namedTag instanceof NestedParentSupport ||
- namedTag instanceof FormTag) {
- parentTag = namedTag;
- }
+ if (namedTag instanceof NestedParentSupport ||
+ namedTag instanceof FormTag) {
+ parentTag = namedTag;
}
} while (parentTag == null && namedTag != null);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
