diff --git a/nondex-core/src/main/java/java/lang/Class.java b/nondex-core/src/main/java/java/lang/Class.java index 2fc0012a..cdec5497 100644 --- a/nondex-core/src/main/java/java/lang/Class.java +++ b/nondex-core/src/main/java/java/lang/Class.java @@ -3338,7 +3338,7 @@ public A[] getAnnotationsByType(Class annotationClass) * @since 1.5 */ public Annotation[] getAnnotations() { - return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationParser.toArray(annotationData().annotations)); + return AnnotationParser.toArray(annotationData().annotations); } /** @@ -3369,7 +3369,7 @@ public A[] getDeclaredAnnotationsByType(Class annotati * @since 1.5 */ public Annotation[] getDeclaredAnnotations() { - return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationParser.toArray(annotationData().declaredAnnotations)); + return AnnotationParser.toArray(annotationData().declaredAnnotations); } // annotation data that might get invalidated when JVM TI RedefineClasses() is called diff --git a/nondex-core/src/main/java/java/lang/reflect/Field.java b/nondex-core/src/main/java/java/lang/reflect/Field.java index 832b6d88..6e243bc8 100644 --- a/nondex-core/src/main/java/java/lang/reflect/Field.java +++ b/nondex-core/src/main/java/java/lang/reflect/Field.java @@ -1123,14 +1123,14 @@ public T getAnnotation(Class annotationClass) { public T[] getAnnotationsByType(Class annotationClass) { Objects.requireNonNull(annotationClass); - return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationSupport.getDirectlyAndIndirectlyPresent(declaredAnnotations(), annotationClass)); + return AnnotationSupport.getDirectlyAndIndirectlyPresent(declaredAnnotations(), annotationClass); } /** * {@inheritDoc} */ public Annotation[] getDeclaredAnnotations() { - return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(AnnotationParser.toArray(declaredAnnotations())); + return AnnotationParser.toArray(declaredAnnotations()); } private transient Map, Annotation> declaredAnnotations; diff --git a/nondex-core/src/main/java/java/lang/reflect/Method.java b/nondex-core/src/main/java/java/lang/reflect/Method.java index 02b4ef60..7b0e89d5 100644 --- a/nondex-core/src/main/java/java/lang/reflect/Method.java +++ b/nondex-core/src/main/java/java/lang/reflect/Method.java @@ -612,7 +612,7 @@ public T getAnnotation(Class annotationClass) { * @since 1.5 */ public Annotation[] getDeclaredAnnotations() { - return edu.illinois.nondex.shuffling.ControlNondeterminism.shuffle(super.getDeclaredAnnotations()); + return super.getDeclaredAnnotations(); } /** @@ -621,11 +621,7 @@ public Annotation[] getDeclaredAnnotations() { */ @Override public Annotation[][] getParameterAnnotations() { - Annotation[][] anns = sharedGetParameterAnnotations(parameterTypes, parameterAnnotations); - for (int i = 0;i