arron 2002/09/10 09:07:59
Modified: src/share/org/apache/struts/taglib/nested/logic
NestedIterateTag.java
src/share/org/apache/struts/taglib/nested
NestedPropertyHelper.java NestedPropertyTag.java
src/share/org/apache/struts/taglib/nested/html
NestedFormTag.java
Log:
Changing the use of the session object to use
instead the request object. Was preventing some
larger implementations of the nested tags on
clustered servers.
Revision Changes Path
1.5 +10 -9
jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
Index: NestedIterateTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NestedIterateTag.java 6 Apr 2002 18:59:30 -0000 1.4
+++ NestedIterateTag.java 10 Sep 2002 16:07:59 -0000 1.5
@@ -62,7 +62,8 @@
import java.util.*;
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.struts.taglib.nested.*;
import org.apache.struts.taglib.html.FormTag;
import org.apache.struts.taglib.logic.IterateTag;
@@ -120,9 +121,9 @@
int temp = super.doStartTag();
/* set the include reference */
- HttpSession session = (HttpSession)pageContext.getSession();
+ HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
currentReference = new NestedReference(getName(), getNestedProperty());
- originalReference = NestedPropertyHelper.setIncludeReference(session,
+ originalReference = NestedPropertyHelper.setIncludeReference(request,
currentReference);
/* return the result */
@@ -163,8 +164,8 @@
/* all done. clean up */
currentReference = null;
- HttpSession session = (HttpSession)pageContext.getSession();
- NestedPropertyHelper.setIncludeReference(session, originalReference);
+ HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
+ NestedPropertyHelper.setIncludeReference(request, originalReference);
originalReference = null;
}
1.8 +10 -9
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NestedPropertyHelper.java 10 Aug 2002 02:00:38 -0000 1.7
+++ NestedPropertyHelper.java 10 Sep 2002 16:07:59 -0000 1.8
@@ -62,7 +62,8 @@
import java.util.StringTokenizer;
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.struts.taglib.nested.html.*;
import org.apache.struts.taglib.nested.logic.*;
import org.apache.struts.taglib.html.FormTag;
@@ -89,17 +90,17 @@
* @param session User's session object
* @param reference New reference to put into the session
*/
- public static final NestedReference setIncludeReference(HttpSession session,
+ public static final NestedReference setIncludeReference(HttpServletRequest
request,
NestedReference reference) {
/* get the old one if any */
NestedReference nr = (NestedReference)
- session.getAttribute(NESTED_INCLUDES_KEY);
+ request.getAttribute(NESTED_INCLUDES_KEY);
if (reference != null) {
/* put in the new one */
- session.setAttribute(NESTED_INCLUDES_KEY, reference);
+ request.setAttribute(NESTED_INCLUDES_KEY, reference);
} else {
/* null target, just remove it */
- session.removeAttribute(NESTED_INCLUDES_KEY);
+ request.removeAttribute(NESTED_INCLUDES_KEY);
}
/* return the old */
return nr;
1.4 +10 -9
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java
Index: NestedPropertyTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NestedPropertyTag.java 13 Mar 2002 13:13:28 -0000 1.3
+++ NestedPropertyTag.java 10 Sep 2002 16:07:59 -0000 1.4
@@ -61,7 +61,8 @@
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.struts.util.*;
/**
@@ -139,8 +140,8 @@
/* make the current reference */
NestedReference nr = new NestedReference(getName(), getNestedProperty());
/* replace and store old session */
- HttpSession session = (HttpSession)pageContext.getSession();
- originalReference = NestedPropertyHelper.setIncludeReference(session,nr);
+ HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
+ originalReference = NestedPropertyHelper.setIncludeReference(request, nr);
return (EVAL_BODY_TAG);
}
@@ -170,8 +171,8 @@
public int doEndTag() throws JspException {
/* set the reference back */
- HttpSession session = (HttpSession)pageContext.getSession();
- NestedPropertyHelper.setIncludeReference(session, originalReference);
+ HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+ NestedPropertyHelper.setIncludeReference(request, originalReference);
originalReference = null;
return (EVAL_PAGE);
1.7 +10 -9
jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java
Index: NestedFormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NestedFormTag.java 10 Aug 2002 02:00:38 -0000 1.6
+++ NestedFormTag.java 10 Sep 2002 16:07:59 -0000 1.7
@@ -64,7 +64,8 @@
import org.apache.struts.taglib.nested.NestedReference;
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
-import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.struts.taglib.html.FormTag;
/**
@@ -100,9 +101,9 @@
int temp = super.doStartTag();
/* set the details */
- HttpSession session = (HttpSession)pageContext.getSession();
+ HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
NestedReference nr = new NestedReference(getBeanName(), getNestedProperty());
- NestedPropertyHelper.setIncludeReference(session, nr);
+ NestedPropertyHelper.setIncludeReference(request, nr);
/* continue */
return temp;
@@ -117,8 +118,8 @@
int temp = super.doEndTag();
/* all done. clean up */
- HttpSession session = (HttpSession)pageContext.getSession();
- NestedPropertyHelper.setIncludeReference(session, null);
+ HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
+ NestedPropertyHelper.setIncludeReference(request, null);
/* return super result */
return temp;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
