From f7d5e15584228acf8e0e98ab977fbb29b8b9f6ab Mon Sep 17 00:00:00 2001 From: hoenicke Date: Tue, 4 Oct 2005 09:21:52 +0000 Subject: [PATCH] * src/net/sf/jode/flow/TransformConstructor.java: (lookForConstructorCall) Check for isStatic before setting outer $this reference (reported by Andreas Salathe bug #1306688) git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1394 379699f6-c40d-0410-875b-85095c16579e --- jode/ChangeLog | 7 +++++++ jode/src/net/sf/jode/flow/TransformConstructors.java | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jode/ChangeLog b/jode/ChangeLog index 265ef85..9b1f1cb 100644 --- a/jode/ChangeLog +++ b/jode/ChangeLog @@ -1,3 +1,10 @@ +2005-10-14 Jochen Hoenicke + + * src/net/sf/jode/flow/TransformConstructor.java: + (lookForConstructorCall) Check for isStatic before setting + outer $this reference + (reported by Andreas Salathé, bug #1306688) + 2005-09-13 Jochen Hoenicke Check for NullPointer in SyntheticAnalyzer. Based on diff --git a/jode/src/net/sf/jode/flow/TransformConstructors.java b/jode/src/net/sf/jode/flow/TransformConstructors.java index d3c0dc6..95f2d3d 100644 --- a/jode/src/net/sf/jode/flow/TransformConstructors.java +++ b/jode/src/net/sf/jode/flow/TransformConstructors.java @@ -164,7 +164,8 @@ public class TransformConstructors { for (int i=0; i< type01Count; ) { MethodAnalyzer current = cons[i]; - if ((Options.options & Options.OPTION_CONTRAFO) != 0 + if (!isStatic + && (Options.options & Options.OPTION_CONTRAFO) != 0 && clazzAnalyzer.getOuterInstance() != null) current.getParamInfo(1).setExpression (clazzAnalyzer.getOuterInstance());