GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Fix https://java.net/jira/browse/GLASSFISH-20778 · javaee/javaee-jsp-api@b0fe733

This repository was archived by the owner on Aug 17, 2018. It is now read-only.

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • api
    • pom.xml
    • src/main/java/javax/servlet/jsp/el
      • ScopedAttributeELResolver.java
  • impl
    • pom.xml
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎api/pom.xml‎

Copy file name to clipboardExpand all lines: api/pom.xml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<modelVersion>4.0.0</modelVersion>
5252
<groupId>javax.servlet.jsp</groupId>
5353
<artifactId>javax.servlet.jsp-api</artifactId>
54-
<version>2.3.2-SNAPSHOT</version>
54+
<version>2.3.2-b01-SNAPSHOT</version>
5555
<packaging>jar</packaging>
5656
<name>JavaServer Pages(TM) API</name>
5757

@@ -261,7 +261,7 @@
261261
<dependency>
262262
<groupId>javax.el</groupId>
263263
<artifactId>javax.el-api</artifactId>
264-
<version>[3.0-b08,)</version>
264+
<version>[3.0.0,)</version>
265265
<scope>provided</scope>
266266
</dependency>
267267
</dependencies>
Collapse file

‎api/src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java‎

Copy file name to clipboardExpand all lines: api/src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
+20-1Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import javax.servlet.jsp.JspContext;
6868

6969
import javax.el.ELContext;
70+
import javax.el.ELClass;
7071
import javax.el.ELResolver;
7172
import javax.el.ELException;
7273

@@ -124,7 +125,25 @@ public Object getValue(ELContext context,
124125
String attribute = (String) property;
125126
PageContext ctxt = (PageContext)
126127
context.getContext(JspContext.class);
127-
return ctxt.findAttribute(attribute);
128+
Object value = ctxt.findAttribute(attribute);
129+
// To support reference of static fields for imported class in
130+
// EL 3.0, if a scoped attribute returns null, this attribute
131+
// is further checked to see if it is the name of an imported
132+
// class. If so, the value of the imported field is return.
133+
// Note: the JSP spec needs to be updated for this behavior. It is
134+
// not backward compatible and a runtime switch may be needed to
135+
// force backward compatility.
136+
if (value == null) {
137+
// check to see if the property is an imported class
138+
if (context.getImportHandler() != null) {
139+
Class<?> c = context.getImportHandler().resolveClass(attribute);
140+
if (c != null) {
141+
value = context.getELResolver().getValue(
142+
context, new ELClass(c), attribute);
143+
}
144+
}
145+
}
146+
return value;
128147
}
129148
}
130149
return null;
Collapse file

‎impl/pom.xml‎

Copy file name to clipboardExpand all lines: impl/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
<dependency>
297297
<groupId>javax.servlet.jsp</groupId>
298298
<artifactId>javax.servlet.jsp-api</artifactId>
299-
<version>2.3.1</version>
299+
<version>[2.3.2-b01,)</version>
300300
</dependency>
301301

302302
<!--

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.