From 5d40a76f5556d8a59f187f213fc5db952eec0bd8 Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Fri, 26 Nov 2004 21:26:22 +0000
Subject: [PATCH] Fix for bug 79377: "Mixed disassembly" should fall back to
 disassembly w/o source when mixed disassembly fails.

---
 debug/org.eclipse.cdt.debug.core/ChangeLog                    | 4 ++++
 .../eclipse/cdt/debug/internal/core/model/Disassembly.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 2ab39ad06b2..fd8bf582962 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-26 Mikhail Khodjaiants
+	Fix for bug 79377: "Mixed disassembly" should fall back to disassembly w/o source when mixed disassembly fails.
+	* Disassembly.java
+
 2004-11-26 Mikhail Khodjaiants
 	Fix for bug 79583: Deffered breakpoints and shared library events.
 	* CSharedLibraryManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java
index c1ef5302c41..4cb919d76b4 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java
@@ -69,7 +69,7 @@ public class Disassembly extends CDebugElement implements IDisassembly {
 							CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS ) );
 				}
 				catch( CDIException e ) {
-					targetRequestFailed( e.getMessage(), e );
+					// ignore and try to get disassembly without source
 				}
 			}
 			// Double check if debugger returns correct address range.