Author: markt
Date: Sat Jun 3 20:53:45 2017
New Revision: 1797540
URL: http://svn.apache.org/viewvc?rev=1797540&view=rev
Log:
Jasper only sets a default stratum.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java?rev=1797540&r1=1797539&r2=1797540&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapGenerator.java Sat Jun 3
20:53:45 2017
@@ -65,6 +65,17 @@ public class SmapGenerator {
outputFileName = x;
}
+
+ /**
+ * Sets the default and only stratum for the smap.
+ *
+ * @param stratum the SmapStratum object to add
+ */
+ public synchronized void setStratum(SmapStratum stratum) {
+ addStratum(stratum, true);
+ }
+
+
/**
* Adds the given SmapStratum object, representing a Stratum with
* logically associated FileSection and LineSection blocks, to
@@ -76,7 +87,10 @@ public class SmapGenerator {
* @param defaultStratum if <tt>true</tt>, this SmapStratum is considered
* to represent the default SMAP stratum unless
* overwritten
+ *
+ * @deprecated Use {@link #setStratum(SmapStratum)}
*/
+ @Deprecated
public synchronized void addStratum(SmapStratum stratum,
boolean defaultStratum) {
strata.add(stratum);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1797540&r1=1797539&r2=1797540&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Sat Jun 3
20:53:45 2017
@@ -87,7 +87,7 @@ public class SmapUtil {
// Map out Node.Nodes
evaluateNodes(pageNodes, s, map, ctxt.getOptions().getMappedFile());
s.optimizeLineSection();
- g.addStratum(s, true);
+ g.setStratum(s);
if (ctxt.getOptions().isSmapDumped()) {
File outSmap = new File(ctxt.getClassFileName() + ".smap");
@@ -113,7 +113,7 @@ public class SmapUtil {
s.optimizeLineSection();
g = new SmapGenerator();
g.setOutputFileName(unqualify(ctxt.getServletJavaFileName()));
- g.addStratum(s, true);
+ g.setStratum(s);
String innerClassFileName =
classFileName.substring(0, classFileName.indexOf(".class")) +
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java?rev=1797540&r1=1797539&r2=1797540&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestSmapGenerator.java Sat Jun
3 20:53:45 2017
@@ -34,7 +34,7 @@ public class TestSmapGenerator {
s.addLineData(2, "foo.jsp", 1, 6, 1);
s.addLineData(3, "foo.jsp", 2, 10, 5);
s.addLineData(20, "/foo/foo/bar.jsp", 1, 30, 1);
- g.addStratum(s, true);
+ g.setStratum(s);
Assert.assertEquals(
"SMAP\n" +
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
