# HG changeset patch
# Parent 6fac9990abaaa653570179b97541c0e7515f9edc
diff --git a/java.source/src/org/netbeans/modules/java/source/save/Reindenter.java b/java.source/src/org/netbeans/modules/java/source/save/Reindenter.java
--- a/java.source/src/org/netbeans/modules/java/source/save/Reindenter.java
+++ b/java.source/src/org/netbeans/modules/java/source/save/Reindenter.java
@@ -74,6 +74,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -133,11 +134,15 @@
             for (Region region : regions) {
                 HashSet<Integer> linesToAddStar = new HashSet<Integer>();
                 LinkedList<Integer> startOffsets = getStartOffsets(region);
-                Iterator<Integer> it = startOffsets.iterator();
-                int startOffset = it.hasNext() ? it.next() : region.getStartOffset();
-                int endOffset = -1;
-                while (endOffset < region.getEndOffset()) {
-                    endOffset = it.hasNext() ? it.next() : region.getEndOffset();
+                for(ListIterator<Integer> it = startOffsets.listIterator(); it.hasNext();) {
+                    int startOffset = it.next();
+                    int endOffset;
+                    if(it.hasNext()) {
+                        endOffset = it.next();
+                        it.previous();
+                    } else {
+                        endOffset = region.getEndOffset();
+                    }
                     String blockCommentLine = null;
                     int delta = 0;
                     if (cs.addLeadingStarInComment() && ((delta = ts.move(startOffset)) > 0 && ts.moveNext() || ts.movePrevious())
@@ -157,10 +162,9 @@
                     if (blockCommentLine != null && !blockCommentLine.startsWith("*")) { //NOI18N
                         linesToAddStar.add(startOffset);
                     }
-                    startOffset = endOffset;
                 }
                 while (!startOffsets.isEmpty()) {
-                    startOffset = startOffsets.removeLast();
+                    int startOffset = startOffsets.removeLast();
                     Integer newIndent = newIndents.get(startOffset);
                     if (linesToAddStar.contains(startOffset)) {
                         context.modifyIndent(startOffset, 0);