[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/javascript JavaScript.java,1.34,1.35

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript
In directory usw-pr-cvs1:/tmp/cvs-serv13341/src/com/meterware/httpunit/javascript

Modified Files:
	JavaScript.java 
Log Message:
Accomodate JavaScript ending with --> rather than // -->

Index: JavaScript.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScript.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- JavaScript.java	24 Oct 2002 13:28:54 -0000	1.34
+++ JavaScript.java	31 Oct 2002 00:26:18 -0000	1.35
@@ -105,7 +105,10 @@
         public String executeScript( String script ) {
             try {
                 script = script.trim();
-                if (script.startsWith( "<!--" )) script = withoutFirstLine( script );
+                if (script.startsWith( "<!--" )) {
+                    script = withoutFirstLine( script );
+                    if (script.endsWith( "-->" )) script = script.substring( 0, script.lastIndexOf( "-->" ));
+                }
                 Context.getCurrentContext().evaluateString( this, script, "httpunit", 0, null );
                 StringBuffer buffer = getDocumentWriteBuffer();
                 return buffer.toString();