Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

1 files changed, 4 insertions, 4 deletions

diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java
index 4eab3791..59f6a3b8 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetter.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetter.java
@@ -5,12 +5,12 @@ class DelegateOnGetter {
     void setList(java.util.ArrayList<java.lang.String> list);
     int getInt();
   }
-  private final @Delegate @Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<Bar>> bar = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<Bar>>();
+  private final @Delegate @Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> bar = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
   DelegateOnGetter() {
     super();
   }
   public @Delegate @java.lang.SuppressWarnings("all") Bar getBar() {
-    java.util.concurrent.atomic.AtomicReference<Bar> value = this.bar.get();
+    java.lang.Object value = this.bar.get();
     if ((value == null))
         {
           synchronized (this.bar)
@@ -28,12 +28,12 @@ class DelegateOnGetter {
                         return 42;
                       }
                     };
-                    value = new java.util.concurrent.atomic.AtomicReference<Bar>(actualValue);
+                    value = ((actualValue == null) ? this.bar : actualValue);
                     this.bar.set(value);
                   }
             }
         }
-    return value.get();
+    return (Bar) ((value == this.bar) ? null : value);
   }
   public @java.lang.SuppressWarnings("all") int getInt() {
     return this.getBar().getInt();