You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ak...@hyperreal.org on 1999/11/13 01:14:17 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime PageContextImpl.java
akv 99/11/12 16:14:15
Modified: src/share/org/apache/jasper/runtime PageContextImpl.java
Log:
Integrated patch: Make PageContextImpl.findAttribute(String) smart.
Submitted by: Tom Rodriguez <tr...@parc.xerox.com>
Reviewed by: Anil V <ak...@eng.sun.com>
Revision Changes Path
1.4 +18 -4 jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PageContextImpl.java 1999/10/17 22:21:32 1.3
+++ PageContextImpl.java 1999/11/13 00:14:14 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.3 1999/10/17 22:21:32 mandar Exp $
- * $Revision: 1.3 $
- * $Date: 1999/10/17 22:21:32 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.4 1999/11/13 00:14:14 akv Exp $
+ * $Revision: 1.4 $
+ * $Date: 1999/11/13 00:14:14 $
*
* ====================================================================
*
@@ -269,7 +269,21 @@
}
public Object findAttribute(String name) {
- return getAttribute(name, getAttributesScope(name));
+ Object o = attributes.get(name);
+ if (o != null)
+ return o;
+
+ o = request.getAttribute(name);
+ if (o != null)
+ return o;
+
+ if (session != null) {
+ o = session.getAttribute(name);
+ if (o != null)
+ return o;
+ }
+
+ return context.getAttribute(name);
}