Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java6
1 files changed, 5 insertions, 1 deletions
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..f6c7ed2f10c 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,10 @@ 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());

Back to the top