diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
index 3cc3430..1aea611 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
@@ -2414,6 +2414,9 @@
 								// ignore all annotation values
 								this.contents[this.contentsOffset++] = 0;
 								this.contents[this.contentsOffset++] = 0;
+//AspectJ patch for bug 507232
+								memberValuePairsCount = 0;
+//AspectJ end
 								break loop;
 							}
 							memberValuePairsCount++;