handel unboxing of null values

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/UnBoxingEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/UnBoxingEvaluator.java
index faa963756f8d6ff0a66eea000a4f336cdcac8b14..efbc8d3def9ca1f3a096e73d982f092cb9d6f3f9 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/UnBoxingEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/UnBoxingEvaluator.java
@@ -58,6 +58,9 @@ public class UnBoxingEvaluator implements Evaluator{
 
   public Object evaluate(EvaluationContextImpl context) throws EvaluateException {
     final Value result = (Value)myOperand.evaluate(context);
+    if (result == null) {
+      throw new EvaluateException("java.lang.NullPointerException: cannot unbox null value");
+    }
     if (result instanceof ObjectReference) {
       final String valueTypeName = result.type().name();
       final Pair<String, String> pair = TYPES_TO_CONVERSION_METHOD_MAP.get(valueTypeName);