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, 8 insertions, 8 deletions

diff --git a/test/transform/resource/after-delombok/GetterLazyBoolean.java b/test/transform/resource/after-delombok/GetterLazyBoolean.java
index caab2803..08d32013 100644
--- a/test/transform/resource/after-delombok/GetterLazyBoolean.java
+++ b/test/transform/resource/after-delombok/GetterLazyBoolean.java
@@ -1,6 +1,6 @@
 class GetterLazyBoolean {
-	private final java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>> booleanValue = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>>();
-	private final java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>> otherBooleanValue = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>>();
+	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> booleanValue = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+	private final java.util.concurrent.atomic.AtomicReference<java.lang.Object> otherBooleanValue = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
 	private static boolean calculateBoolean() {
 		return true;
 	}
@@ -33,32 +33,32 @@ class GetterLazyBoolean {
 	}
 	@java.lang.SuppressWarnings("all")
 	public boolean isBooleanValue() {
-		java.util.concurrent.atomic.AtomicReference<java.lang.Boolean> value = this.booleanValue.get();
+		java.lang.Object value = this.booleanValue.get();
 		if (value == null) {
 			synchronized (this.booleanValue) {
 				value = this.booleanValue.get();
 				if (value == null) {
 					final boolean actualValue = calculateBoolean();
-					value = new java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>(actualValue);
+					value = actualValue;
 					this.booleanValue.set(value);
 				}
 			}
 		}
-		return value.get();
+		return (java.lang.Boolean)value;
 	}
 	@java.lang.SuppressWarnings("all")
 	public boolean isOtherBooleanValue() {
-		java.util.concurrent.atomic.AtomicReference<java.lang.Boolean> value = this.otherBooleanValue.get();
+		java.lang.Object value = this.otherBooleanValue.get();
 		if (value == null) {
 			synchronized (this.otherBooleanValue) {
 				value = this.otherBooleanValue.get();
 				if (value == null) {
 					final boolean actualValue = !calculateBoolean();
-					value = new java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>(actualValue);
+					value = actualValue;
 					this.otherBooleanValue.set(value);
 				}
 			}
 		}
-		return value.get();
+		return (java.lang.Boolean)value;
 	}
 }