Revert "Revert commit Bug 434695 - Hot Code Replace drops some frames in case of anonymous classes"

This reverts commit d52384fa2843ef7b25c31b9c4c10d6a0b0c82724.

1 files changed, 5 insertions, 1 deletions

diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java
index d64bd8b65..05e7c9942 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/hcr/MethodSearchVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Yevgen Kogan - Bug 403475 - Hot Code Replace drops too much frames in some cases
+ *     Jacob Saoumi - Bug 434695 - Hot Code Replace drops some frames in case of anonymous classes
  *******************************************************************************/
 package org.eclipse.jdt.internal.debug.core.hcr;
 
@@ -178,6 +179,9 @@ public class MethodSearchVisitor extends ASTVisitor {
 		String typeName = null;
 		if (binding != null) {
 			typeName = binding.getQualifiedName();
+			if ((typeName == null || "".equals(typeName)) && binding.getBinaryName() != null) { //$NON-NLS-1$
+				typeName = binding.getBinaryName().replace('$', '.');
+			}
 		}
 		// if no binding exists, the behaviour should be the same as without checking for type name
 		if (node.getName().getIdentifier().equals(fName) && (typeName == null || typeName.equals(fClassName))) {