[jboss-svn-commits] JBL Code SVN: r29151 - labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2009-09-02 10:57:12 -0400 (Wed, 02 Sep 2009)
New Revision: 29151

Modified:
   labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java
Log:
line numbers should be right now -- fixes reopened BYTEMAN-16

Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java	2009-09-02 14:35:12 UTC (rev 29150)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java	2009-09-02 14:57:12 UTC (rev 29151)
@@ -86,11 +86,11 @@
                 LocationType locationType = null;
                 Location targetLocation = null;
                 int lineNumber = 0;
+                int startNumber = -1;
                 int maxLines = lines.length;
                 boolean inRule = false;
                 for (String line : lines) {
                     lineNumber++;
-                    int startNumber = -1;
                     if (line.trim().startsWith("#")) {
                         if (inRule) {
                             // add a blank line in place of the comment so the line numbers
@@ -158,6 +158,8 @@
                         nextRule = "";
                         sepr = "";
                         inRule = false;
+                        // reset start nuuber so we pick up the next rule text line
+                        startNumber = -1;
                     } else if (lineNumber == maxLines && !nextRule.trim().equals("")) {
                             throw new Exception("org.jboss.byteman.agent.Transformer : no matching ENDRULE for RULE " + name + " in script " + scriptPaths.get(scriptIdx));
                     } else {