You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/28 15:45:32 UTC
[tomcat] branch 7.0.x updated (9af6dc9 -> 94cbea7)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 9af6dc9 optimized code,replace some c-style array
new b8f9eb8 Formatting clean-up to improve clarity. No functional change.
new 94cbea7 Fix compilation of JSPs with inner classes with ECJ 4.14 onwards
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/jasper/compiler/JDTCompiler.java | 50 ++++++++----------------
webapps/docs/changelog.xml | 5 +++
2 files changed, 21 insertions(+), 34 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Formatting clean-up to improve clarity. No
functional change.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b8f9eb8f9fc8b74b6914f11b26a319b24fa61cc5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 28 16:43:59 2020 +0100
Formatting clean-up to improve clarity. No functional change.
---
java/org/apache/jasper/compiler/JDTCompiler.java | 48 ++++++++----------------
1 file changed, 15 insertions(+), 33 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
index bec0887..70333ba 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -96,8 +96,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
* Compile the servlet from .java file to .class file
*/
@Override
- protected void generateClass(String[] smap)
- throws FileNotFoundException, JasperException, Exception {
+ protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception {
long t1 = 0;
if (log.isDebugEnabled()) {
@@ -107,14 +106,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
final String sourceFile = ctxt.getServletJavaFileName();
final String outputDir = ctxt.getOptions().getScratchDir().getAbsolutePath();
String packageName = ctxt.getServletPackageName();
- final String targetClassName =
- ((packageName.length() != 0) ? (packageName + ".") : "")
- + ctxt.getServletClassName();
+ final String targetClassName = ((packageName.length() != 0) ? (packageName + ".") : "") + ctxt.getServletClassName();
final ClassLoader classLoader = ctxt.getJspLoader();
String[] fileNames = new String[] {sourceFile};
String[] classNames = new String[] {targetClassName};
- final ArrayList<JavacErrorDetail> problemList =
- new ArrayList<JavacErrorDetail>();
+ final ArrayList<JavacErrorDetail> problemList = new ArrayList<JavacErrorDetail>();
class CompilationUnit implements ICompilationUnit {
@@ -139,14 +135,12 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
Reader reader = null;
try {
is = new FileInputStream(sourceFile);
- isr = new InputStreamReader(is,
- ctxt.getOptions().getJavaEncoding());
+ isr = new InputStreamReader(is, ctxt.getOptions().getJavaEncoding());
reader = new BufferedReader(isr);
char[] chars = new char[8192];
StringBuilder buf = new StringBuilder();
int count;
- while ((count = reader.read(chars, 0,
- chars.length)) > 0) {
+ while ((count = reader.read(chars, 0, chars.length)) > 0) {
buf.append(chars, 0, count);
}
result = new char[buf.length()];
@@ -184,8 +178,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
@Override
public char[][] getPackageName() {
- StringTokenizer izer =
- new StringTokenizer(className, ".");
+ StringTokenizer izer = new StringTokenizer(className, ".");
char[][] result = new char[izer.countTokens()-1][];
for (int i = 0; i < result.length; i++) {
String tok = izer.nextToken();
@@ -216,9 +209,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
}
@Override
- public NameEnvironmentAnswer
- findType(char[] typeName,
- char[][] packageName) {
+ public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) {
StringBuilder result = new StringBuilder();
String sep = "";
for (int i = 0; i < packageName.length; i++) {
@@ -236,19 +227,15 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
InputStream is = null;
try {
if (className.equals(targetClassName)) {
- ICompilationUnit compilationUnit =
- new CompilationUnit(sourceFile, className);
- return
- new NameEnvironmentAnswer(compilationUnit, null);
+ ICompilationUnit compilationUnit = new CompilationUnit(sourceFile, className);
+ return new NameEnvironmentAnswer(compilationUnit, null);
}
- String resourceName =
- className.replace('.', '/') + ".class";
+ String resourceName = className.replace('.', '/') + ".class";
is = classLoader.getResourceAsStream(resourceName);
if (is != null) {
byte[] classBytes;
byte[] buf = new byte[8192];
- ByteArrayOutputStream baos =
- new ByteArrayOutputStream(buf.length);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(buf.length);
int count;
while ((count = is.read(buf, 0, buf.length)) > 0) {
baos.write(buf, 0, count);
@@ -256,11 +243,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
baos.flush();
classBytes = baos.toByteArray();
char[] fileName = className.toCharArray();
- ClassFileReader classFileReader =
- new ClassFileReader(classBytes, fileName,
- true);
- return
- new NameEnvironmentAnswer(classFileReader, null);
+ ClassFileReader classFileReader = new ClassFileReader(classBytes, fileName, true);
+ return new NameEnvironmentAnswer(classFileReader, null);
}
} catch (IOException exc) {
log.error("Compilation error", exc);
@@ -298,8 +282,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
}
@Override
- public boolean isPackage(char[][] parentPackageName,
- char[] packageName) {
+ public boolean isPackage(char[][] parentPackageName, char[] packageName) {
StringBuilder result = new StringBuilder();
String sep = "";
if (parentPackageName != null) {
@@ -325,8 +308,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
};
- final IErrorHandlingPolicy policy =
- DefaultErrorHandlingPolicies.proceedWithAllProblems();
+ final IErrorHandlingPolicy policy = DefaultErrorHandlingPolicies.proceedWithAllProblems();
final Map<String,String> settings = new HashMap<String,String>();
settings.put(CompilerOptions.OPTION_LineNumberAttribute,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix compilation of JSPs with inner classes with ECJ
4.14 onwards
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 94cbea7df91d6418e879397ef98e46b7454ec758
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 28 16:00:03 2020 +0100
Fix compilation of JSPs with inner classes with ECJ 4.14 onwards
---
java/org/apache/jasper/compiler/JDTCompiler.java | 2 +-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
index 70333ba..9bc5e1c 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -263,7 +263,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
}
private boolean isPackage(String result) {
- if (result.equals(targetClassName)) {
+ if (result.equals(targetClassName) || result.startsWith(targetClassName + '$')) {
return false;
}
String resourceName = result.replace('.', '/') + ".class";
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a06c14b..2f548be 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,11 @@
Add more descriptive error message in DefaultServlet for SC_NOT_FOUND.
(michaelo)
</add>
+ <fix>
+ Ensure that the Jasper code that interfaces with the Eclipse Compiler
+ for Java (ECJ) enables Jasper to compile JSPs using ECJ 4.14 onwards
+ when the JSPs have inner classes. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org