[i554] Another try to prevent NPEs on IBM J9

1 files changed, 5 insertions, 1 deletions

diff --git a/src/core/lombok/javac/apt/Processor.java b/src/core/lombok/javac/apt/Processor.java
index 3d234541..ce4d75ff 100644
--- a/src/core/lombok/javac/apt/Processor.java
+++ b/src/core/lombok/javac/apt/Processor.java
@@ -256,12 +256,16 @@ public class Processor extends AbstractProcessor {
 			for (int i = priorityLevels.length - 1; i >= 0; i--) {
 				Long curLevel = priorityLevels[i];
 				Long nextLevel = (i == priorityLevels.length - 1) ? null : priorityLevels[i + 1];
+				List<JCCompilationUnit> cusToAdvance = new ArrayList<JCCompilationUnit>();
 				for (Map.Entry<JCCompilationUnit, Long> entry : roots.entrySet()) {
 					if (curLevel.equals(entry.getValue())) {
-						entry.setValue(nextLevel);
+						cusToAdvance.add(entry.getKey());
 						newLevels.add(nextLevel);
 					}
 				}
+				for (JCCompilationUnit unit : cusToAdvance) {
+					roots.put(unit, nextLevel);
+				}
 			}
 			newLevels.remove(null);