fixed a bug of replace(String,ExprEditor) in javassist.expr.Expr.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@267 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/javassist/expr/Expr.java b/src/main/javassist/expr/Expr.java
index c6cf78eb..e2d455f2 100644
--- a/src/main/javassist/expr/Expr.java
+++ b/src/main/javassist/expr/Expr.java
@@ -301,14 +301,13 @@ public abstract class Expr implements Opcode {
         codeAttr.setMaxLocals(newLocals);
         ExprEditor.LoopContext context
             = new ExprEditor.LoopContext(newLocals);
-        CodeIterator iterator = codeAttr.iterator();
-        iterator.move(currentPos);
-        int size = iterator.getCodeLength();
+        int size = oldIterator.getCodeLength();
         int endPos = oldIterator.lookAhead();
-        if (ed.doit(thisClass, thisMethod, context, iterator, endPos))
+        oldIterator.move(currentPos);
+        if (ed.doit(thisClass, thisMethod, context, oldIterator, endPos))
             edited = true;
 
-        oldIterator.move(endPos + iterator.getCodeLength() - size);
+        oldIterator.move(endPos + oldIterator.getCodeLength() - size);
         codeAttr.setMaxLocals(orgLocals);
         codeAttr.setMaxStack(orgStack);
         maxLocals = context.maxLocals;