Merge branch 'master' into lazyinit

Conflicts:
	src/core/lombok/javac/handlers/HandleGetter.java

2 files changed, 16 insertions, 4 deletions

diff --git a/test/transform/resource/before/ValErrors.java b/test/transform/resource/before/ValErrors.java
index 742bca6d..7c5c0a8b 100644
--- a/test/transform/resource/before/ValErrors.java
+++ b/test/transform/resource/before/ValErrors.java
@@ -1,9 +1,9 @@
 public class ValErrors {
-	public void nullType() {
-		val a = null;
-	}
-	
 	public void unresolvableExpression() {
 		val c = d;
 	}
+	
+	public void arrayInitializer() {
+		val e = { "foo", "bar"};
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/ValWeirdTypes.java b/test/transform/resource/before/ValWeirdTypes.java
index 6f6eb9db..855fb91f 100644
--- a/test/transform/resource/before/ValWeirdTypes.java
+++ b/test/transform/resource/before/ValWeirdTypes.java
@@ -51,4 +51,16 @@ public class ValWeirdTypes<Z> {
 		val d = c ? a : b;
 		java.util.RandomAccess confirm = c ? a : b;
 	}
+	
+	public void nullType() {
+		val nully = null;
+	}
+	
+	public void testArrays() {
+		val intArray = new int[] {1, 2, 3};
+		val multiDimArray = new Object[][] {{}};
+		val copy = intArray;
+		val single = multiDimArray[0];
+		val singleInt = copy[0];
+	}
 }
\ No newline at end of file