fixed JASSIST-211

diff --git a/Readme.html b/Readme.html
index 290d20972530fc61c28572d052570029328a30be..4c5288beb999e0399d918db8fb123d4028d17990 100644 (file)
--- a/Readme.html
+++ b/Readme.html
@@ -283,7 +283,7 @@ see javassist.Dump.
 
 <p>-version 3.19
 <ul>
-<li>JIRA JASSIST-158, 205, 206, 207, 212, 216.
+<li>JIRA JASSIST-158, 205, 206, 207, 211, 212, 216.
 </ul>
 </p>
 

diff --git a/src/main/javassist/compiler/CodeGen.java b/src/main/javassist/compiler/CodeGen.java
index bf61a2b1f287e945aea04024b805e506aaba722b..bbcce89592293fe0d45df529776c851cca8ff930 100644 (file)
--- a/src/main/javassist/compiler/CodeGen.java
+++ b/src/main/javassist/compiler/CodeGen.java
@@ -434,7 +434,7 @@ public abstract class CodeGen extends Visitor implements Opcode, TokenId {
         if (notDo)
             bytecode.write16bit(pc, pc3 - pc + 1);
 
-        boolean alwaysBranch = compileBooleanExpr(true, expr);
+        boolean alwaysBranch = compileBooleanExpr(true, expr) && breakList.size() == 0;
         bytecode.addIndex(pc2 - bytecode.currentPc() + 1);
 
         patchGoto(breakList, bytecode.currentPc());

diff --git a/src/test/javassist/JvstTest4.java b/src/test/javassist/JvstTest4.java
index df4533bbfebbe2a6b9af15ecb7ef131d58237fcd..f1aca09e938667fde90c32748dce1f7110452f2d 100644 (file)
--- a/src/test/javassist/JvstTest4.java
+++ b/src/test/javassist/JvstTest4.java
@@ -938,4 +938,22 @@ public class JvstTest4 extends JvstTestRoot {
         cc.writeFile();
         Object obj = make(cc.getName());
     }
+
+    public void testWhileTrueKO() throws Exception {
+        final ClassPool pool = ClassPool.getDefault();
+        final CtClass cc = pool.makeClass("test4.TestWhileTrueKO");
+        String source = "public void testWhile() { while(true) { break; } }";
+        cc.addMethod(CtMethod.make(source, cc));
+        cc.writeFile();
+        make(cc.getName());
+    }
+
+    public void testWhileTrueOK() throws Exception {
+        final ClassPool pool = ClassPool.getDefault();
+        final CtClass cc = pool.makeClass("test4.TestWhileTrueOK");
+        String source = "public void testWhile() { while(0==0) { break; }}";
+        cc.addMethod(CtMethod.make(source, cc));
+        cc.writeFile();
+        make(cc.getName());
+    }
 }