Expr.where() throws an exception if the expression is in a static initializer.

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

diff --git a/Readme.html b/Readme.html
index 5b85662fed6740657f67c780613725ef81a7ea0b..8fd543d13dbc43c2db49f40ad1157f7f1fa9888b 100644 (file)
--- a/Readme.html
+++ b/Readme.html
@@ -569,7 +569,7 @@ Andreas Salathe, Dante Torres estrada, S. Pam, Nuno Santos,
 Denis Taye, Colin Sampaleanu, Robert Bialek, Asato Shimotaki,
 Howard Lewis Ship, Richard Jones, Marjan Sterjev,
 Bruce McDonald, Mark Brennan, Vlad Skarzhevskyy,
-Brett Randall, Tsuyoshi Murakami, and Nathan Meyers
+Brett Randall, Tsuyoshi Murakami, Nathan Meyers, and Yoshiyuki Usui
 for their contributions.
 
 <p><br>

diff --git a/src/main/javassist/expr/Expr.java b/src/main/javassist/expr/Expr.java
index 882f8cb437997dc9a0a8ba293c36d6c76496dd84..50d25d52dbb0fa06b4f41c3759365b65e00b694a 100644 (file)
--- a/src/main/javassist/expr/Expr.java
+++ b/src/main/javassist/expr/Expr.java
@@ -69,9 +69,13 @@ public abstract class Expr implements Opcode {
         MethodInfo mi = thisMethod;
         CtBehavior[] cb = thisClass.getDeclaredBehaviors();
         for (int i = cb.length - 1; i >= 0; --i)
-            if (cb[i].getMethodInfo() == mi)
+            if (cb[i].getMethodInfo2() == mi)
                 return cb[i];
 
+        CtConstructor init = thisClass.getClassInitializer();
+        if (init.getMethodInfo2() == mi)
+            return init;
+
         throw new RuntimeException("fatal: not found");
     }