Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 2 insertions, 2 deletions

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
index d299af172340..69cbb140be86 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
@@ -83,8 +83,8 @@ public class MethodEvaluator implements Evaluator {
       ReferenceType referenceType = null;
 
       if(object instanceof ObjectReference) {
-        final ReferenceType qualifierType = ((ObjectReference)object).referenceType();
-        referenceType = debugProcess.findClass(context, qualifierType.name(), qualifierType.classLoader());
+        // it seems that if we have an object of the class, the class must be ready, so no need to use findClass here
+        referenceType = ((ObjectReference)object).referenceType();
       }
       else if(object instanceof ClassType) {
         final ClassType qualifierType = (ClassType)object;