Author: niallp
Date: Sat Feb 11 14:32:59 2006
New Revision: 377073
URL: http://svn.apache.org/viewcvs?rev=377073&view=rev
Log:
Fix for Bug 38529 - BaseHandlerTag should use LoopTag rather then
LoopTagSupport to verify JSLT - reported by John Petrocik
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseHandlerTag.java
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseHandlerTag.java
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseHandlerTag.java?rev=377073&r1=377072&r2=377073&view=diff
==============================================================================
---
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseHandlerTag.java
(original)
+++
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseHandlerTag.java
Sat Feb 11 14:32:59 2006
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,8 +40,7 @@
* implement the doStartTag() or doEndTag() methods. Subclasses should provide
* appropriate implementations of these.
*
- * @version $Rev$ $Date: 2005-08-21 19:08:45 -0400 (Sun, 21 Aug 2005)
- * $
+ * @version $Rev$ $Date$
*/
public abstract class BaseHandlerTag extends BodyTagSupport {
/**
@@ -250,8 +249,8 @@
* The message resources key of the advisory title.
*/
private String titleKey = null;
- private Class loopTagSupportClass = null;
- private Method loopTagSupportGetStatus = null;
+ private Class loopTagClass = null;
+ private Method loopTagGetStatus = null;
private Class loopTagStatusClass = null;
private Method loopTagStatusGetIndex = null;
private boolean triedJstlInit = false;
@@ -804,12 +803,12 @@
triedJstlInit = true;
try {
- loopTagSupportClass =
+ loopTagClass =
RequestUtils.applicationClass(
- "javax.servlet.jsp.jstl.core.LoopTagSupport");
+ "javax.servlet.jsp.jstl.core.LoopTag");
- loopTagSupportGetStatus =
- loopTagSupportClass.getDeclaredMethod("getLoopStatus",
null);
+ loopTagGetStatus =
+ loopTagClass.getDeclaredMethod("getLoopStatus", null);
loopTagStatusClass =
RequestUtils.applicationClass(
@@ -828,13 +827,13 @@
if (triedJstlSuccess) {
try {
Object loopTag =
- findAncestorWithClass(this, loopTagSupportClass);
+ findAncestorWithClass(this, loopTagClass);
if (loopTag == null) {
return null;
}
- Object status = loopTagSupportGetStatus.invoke(loopTag, null);
+ Object status = loopTagGetStatus.invoke(loopTag, null);
return (Integer) loopTagStatusGetIndex.invoke(status, null);
} catch (IllegalAccessException ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
