From f3fcdcf65ce8c4140f1a3f4e6be18b87a053861b Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 24 Jan 2011 19:45:25 +0100
Subject: NPE fix

---
 src/core/lombok/javac/TreeMirrorMaker.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/core/lombok/javac/TreeMirrorMaker.java b/src/core/lombok/javac/TreeMirrorMaker.java
index 1c0b9311..d3f95b29 100644
--- a/src/core/lombok/javac/TreeMirrorMaker.java
+++ b/src/core/lombok/javac/TreeMirrorMaker.java
@@ -30,17 +30,21 @@ public class TreeMirrorMaker extends TreeCopier<Void> {
 	
 	@Override public <T extends JCTree> List<T> copy(List<T> originals) {
 		List<T> copies = super.copy(originals);
-		Iterator<T> it1 = originals.iterator();
-		Iterator<T> it2 = copies.iterator();
-		while (it1.hasNext()) originalToCopy.put(it1.next(), it2.next());
+		if (originals != null) {
+			Iterator<T> it1 = originals.iterator();
+			Iterator<T> it2 = copies.iterator();
+			while (it1.hasNext()) originalToCopy.put(it1.next(), it2.next());
+		}
 		return copies;
 	}
 	
 	@Override public <T extends JCTree> List<T> copy(List<T> originals, Void p) {
 		List<T> copies = super.copy(originals, p);
-		Iterator<T> it1 = originals.iterator();
-		Iterator<T> it2 = copies.iterator();
-		while (it1.hasNext()) originalToCopy.put(it1.next(), it2.next());
+		if (originals != null) {
+			Iterator<T> it1 = originals.iterator();
+			Iterator<T> it2 = copies.iterator();
+			while (it1.hasNext()) originalToCopy.put(it1.next(), it2.next());
+		}
 		return copies;
 	}
 	
-- 
cgit