Bug 498925: NullPointerException in Config.delegateGetMethodBodies
- prep: fix merge bug
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeBinding.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeBinding.java
index d0b7bb4..a869e24 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeBinding.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeBinding.java
@@ -133,18 +133,15 @@
}
if (refType != null) {
//{ObjectTeams: calling getAnnotations() requires Dependencies control:
-/* orig:
- org.eclipse.jdt.internal.compiler.lookup.AnnotationBinding[] internalAnnotations = refType.getAnnotations();
- :giro */
- org.eclipse.jdt.internal.compiler.lookup.AnnotationBinding[] internalAnnotations = null;
- Dependencies.setup(this, null, this.resolver.lookupEnvironment(), true, true); // TODO(SH): parser, flags?
- try {
- internalAnnotations = refType.getAnnotations();
- } finally {
- Dependencies.release(this);
- }
-// SH}
+ Dependencies.setup(this, null, this.resolver.lookupEnvironment(), true, true); // TODO(SH): parser, flags?
+ try {
+// orig:
return this.annotations = resolveAnnotationBindings(refType.getAnnotations(), false);
+// :giro
+ } finally {
+ Dependencies.release(this);
+ }
+// SH}
}
return this.annotations = AnnotationBinding.NoAnnotations;
}
