Bug 547096 - [WIP] show value's type instead of variable's type

Change-Id: I232d629d2b65568b60c2e316702b1b7b59ba2f1e
Signed-off-by: Julian Honnen <julian.honnen@vector.com>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
index 40d6292..c5696fa 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
@@ -1299,9 +1299,11 @@
 		StringBuilder buff= new StringBuilder();
 		String typeName= DebugUIMessages.JDIModelPresentation_unknown_type__2;
 		try {
-			typeName= var.getReferenceTypeName();
-			if (showTypes) {
-				typeName= getQualifiedName(typeName);
+			if (javaValue != null) {
+				typeName = javaValue.getReferenceTypeName();
+				if (showTypes) {
+					typeName = getQualifiedName(typeName);
+				}
 			}
 		} catch (DebugException exception) {
 		}