svn commit: r1797344 - /tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java

[markt]

Author: markt
Date: Fri Jun  2 09:29:37 2017
New Revision: 1797344

URL: http://svn.apache.org/viewvc?rev=1797344&view=rev
Log:
Revert changes that should not have been included in 1797338

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1797344&r1=1797343&r2=1797344&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Fri Jun  2 
09:29:37 2017
@@ -68,8 +68,6 @@ public abstract class Compiler {
 
     protected Node.Nodes pageNodes;
 
-    private String[] smap;
-
 
     // ------------------------------------------------------------ Constructor
 
@@ -95,20 +93,6 @@ public abstract class Compiler {
 
 
     /**
-     * Obtain the source map for this file. This is cached on compilation. If
-     * the process has been restarted since compilation, null will be returned.
-     * TODO: Extract the SMAP from the class file if the cached copy is not
-     *       available (assumes SMAP is not suppressed)
-     *
-     * @return The source map in the format it is written to the class file or
-     *         {@code null} if not available.
-     */
-    public String[] getSmap() {
-        return smap;
-    }
-
-
-    /**
      * Compile the jsp file into equivalent servlet in .java file
      *
      * @return a smap for the current JSP page, if one is generated, null
@@ -386,7 +370,7 @@ public abstract class Compiler {
         }
 
         try {
-            smap = generateJava();
+            String[] smap = generateJava();
             File javaFile = new File(ctxt.getServletJavaFileName());
             Long jspLastModified = ctxt.getLastModified(ctxt.getJspFile());
             javaFile.setLastModified(jspLastModified.longValue());



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org