diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2010-11-09 21:32:40 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2010-11-09 21:32:40 +0100 |
| commit | c88ae3af7432513987eafaf13c178baa77cb0667 (patch) | |
| tree | b45fee768d8f27fcfcf535e6dfa6500bdbef6cd6 /test | |
| parent | 0951ea38fe11189cdc4c2778fdad9e9e3ad6a6ae (diff) | |
| parent | 16f992c5adea8ed8ad183d27c247901d61b0635d (diff) | |
| download | lombok-c88ae3af7432513987eafaf13c178baa77cb0667.tar.gz lombok-c88ae3af7432513987eafaf13c178baa77cb0667.tar.bz2 lombok-c88ae3af7432513987eafaf13c178baa77cb0667.zip | |
Merge branch 'master' into javaChickenAndEgg
Conflicts:
src/core/lombok/javac/handlers/HandleCleanup.java
Diffstat (limited to 'test')
4 files changed, 8 insertions, 8 deletions
diff --git a/test/transform/resource/after-delombok/CleanupName.java b/test/transform/resource/after-delombok/CleanupName.java index 0201008e..37a8d117 100644 --- a/test/transform/resource/after-delombok/CleanupName.java +++ b/test/transform/resource/after-delombok/CleanupName.java @@ -4,7 +4,7 @@ class CleanupName { try { System.out.println(o); } finally { - if (o != null) { + if (lombok.Lombok.preventNullAnalysis(o) != null) { o.toString(); } } @@ -14,7 +14,7 @@ class CleanupName { try { System.out.println(o); } finally { - if (o != null) { + if (lombok.Lombok.preventNullAnalysis(o) != null) { o.toString(); } } diff --git a/test/transform/resource/after-delombok/CleanupPlain.java b/test/transform/resource/after-delombok/CleanupPlain.java index 1a19442f..67c82f60 100644 --- a/test/transform/resource/after-delombok/CleanupPlain.java +++ b/test/transform/resource/after-delombok/CleanupPlain.java @@ -9,12 +9,12 @@ class CleanupPlain { out.flush(); } } finally { - if (out != null) { + if (lombok.Lombok.preventNullAnalysis(out) != null) { out.close(); } } } finally { - if (in != null) { + if (lombok.Lombok.preventNullAnalysis(in) != null) { in.close(); } } diff --git a/test/transform/resource/after-ecj/CleanupName.java b/test/transform/resource/after-ecj/CleanupName.java index 4011721b..8948e91d 100644 --- a/test/transform/resource/after-ecj/CleanupName.java +++ b/test/transform/resource/after-ecj/CleanupName.java @@ -10,7 +10,7 @@ class CleanupName { } finally { - if ((o != null)) + if ((lombok.Lombok.preventNullAnalysis(o) != null)) { o.toString(); } @@ -24,7 +24,7 @@ class CleanupName { } finally { - if ((o != null)) + if ((lombok.Lombok.preventNullAnalysis(o) != null)) { o.toString(); } diff --git a/test/transform/resource/after-ecj/CleanupPlain.java b/test/transform/resource/after-ecj/CleanupPlain.java index fe8d7571..6eaa4377 100644 --- a/test/transform/resource/after-ecj/CleanupPlain.java +++ b/test/transform/resource/after-ecj/CleanupPlain.java @@ -18,7 +18,7 @@ class CleanupPlain { } finally { - if ((out != null)) + if ((lombok.Lombok.preventNullAnalysis(out) != null)) { out.close(); } @@ -26,7 +26,7 @@ class CleanupPlain { } finally { - if ((in != null)) + if ((lombok.Lombok.preventNullAnalysis(in) != null)) { in.close(); } |