From 12786b9330dea24e38717a1d5e2677b261765925 Mon Sep 17 00:00:00 2001
From: Randy Rohrbach <Randy.Rohrbach@Windriver.com>
Date: Tue, 11 Aug 2009 19:37:07 +0000
Subject: [PATCH] Defect 286315.

---
 .../cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
index 4f3e1faf280..21b45a0908e 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
@@ -584,7 +584,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IL
 				
 			};
 			
-			IMemoryBlock block = retrieval.getMemoryBlock(0, 1024) ;
+			IMemoryBlock block = null;
 			if(retrieval instanceof IAdaptable)
 			{
 				IMemoryBlockRetrievalExtension retrievalExtension = (IMemoryBlockRetrievalExtension) 
@@ -593,6 +593,11 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IL
 					block = retrievalExtension.getExtendedMemoryBlock("0", context); //$NON-NLS-1$
 			}
 			
+			if ( block == null ) {
+				MemoryBrowserPlugin.getDefault().getLog().log(new Status(Status.ERROR, MemoryBrowserPlugin.PLUGIN_ID, "Extended Memory Block could not be obtained")); //$NON-NLS-1$
+				return;
+			}
+			
 			fCurrentContainers.add(container);
 			rendering.init(container, block);
 			rendering.createControl(tab.getParent());