You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2004/03/01 23:51:34 UTC

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Node.java

kinman      2004/03/01 14:51:34

  Modified:    jasper2/src/share/org/apache/jasper/compiler Node.java
  Log:
  - Fix 27338: Wrong Smap line for CDATA in scriptlets in .jspx pages.
  
  Revision  Changes    Path
  1.79      +15 -3     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
  
  Index: Node.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- Node.java	28 Oct 2003 23:04:11 -0000	1.78
  +++ Node.java	1 Mar 2004 22:51:34 -0000	1.79
  @@ -829,6 +829,18 @@
   	    }
   	    return ret;
   	}
  +
  +        /**
  +         * For the same reason as above, the source line information in the
  +         * contained TemplateText node should be used.
  +         */
  +        public Mark getStart() {
  +            if (text == null && body != null && body.size() > 0) {
  +                return body.getNode(0).getStart();
  +            } else {
  +                return super.getStart();
  +            }
  +        }
       }
   
       /**
  
  
  

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