Harness for an NPE seen in RL

1 files changed, 7 insertions, 1 deletions

diff --git a/plugins/org.eclipse.objectteams.otdt/src/org/eclipse/objectteams/otdt/core/hierarchy/OTTypeHierarchies.java b/plugins/org.eclipse.objectteams.otdt/src/org/eclipse/objectteams/otdt/core/hierarchy/OTTypeHierarchies.java
index a175128ff..ecab0e052 100644
--- a/plugins/org.eclipse.objectteams.otdt/src/org/eclipse/objectteams/otdt/core/hierarchy/OTTypeHierarchies.java
+++ b/plugins/org.eclipse.objectteams.otdt/src/org/eclipse/objectteams/otdt/core/hierarchy/OTTypeHierarchies.java
@@ -588,7 +588,13 @@ public team class OTTypeHierarchies {
 		}
 
 		callin void ensureJavaType(IType type) {
-			if (type instanceof IOTType) type = (IType) ((IOTType)type).getCorrespondingJavaElement();
+			if (type instanceof IOTType) {
+				 IJavaElement jElem = ((IOTType)type).getCorrespondingJavaElement();
+				 if (jElem instanceof IType)
+					 type = (IType) jElem;
+				 else
+					 OTDTPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, OTDTPlugin.PLUGIN_ID, "OTType has not corresponding JavaElement: "+type));
+			}
 			base.ensureJavaType(type);
 		}