Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-10-18 05:49:40 +0000
committerUwe Stieber2012-10-18 05:49:40 +0000
commit54bdfdfd54264d3cd807ea3dabd06eaaff185906 (patch)
treeb03a5c406d654fa06af0a296199a16689daa4393 /target_explorer
parentbd47b7d2cff71b9418769ce63d85375ac796311c (diff)
downloadorg.eclipse.tcf-54bdfdfd54264d3cd807ea3dabd06eaaff185906.tar.gz
org.eclipse.tcf-54bdfdfd54264d3cd807ea3dabd06eaaff185906.tar.xz
org.eclipse.tcf-54bdfdfd54264d3cd807ea3dabd06eaaff185906.zip
Target Explorer: Fix NPE
Diffstat (limited to 'target_explorer')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/internal/PersistenceDelegateBindingExtensionPointManager.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/internal/PersistenceDelegateBindingExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/internal/PersistenceDelegateBindingExtensionPointManager.java
index beb37117b..8fb7be029 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/internal/PersistenceDelegateBindingExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/src/org/eclipse/tcf/te/runtime/persistence/internal/PersistenceDelegateBindingExtensionPointManager.java
@@ -115,9 +115,11 @@ public class PersistenceDelegateBindingExtensionPointManager extends AbstractExt
evalContext.addVariable("context", context); //$NON-NLS-1$
if (context instanceof Class) evalContext.addVariable("contextClass", ((Class<?>)context).getName()); //$NON-NLS-1$
else evalContext.addVariable("contextClass", context.getClass().getName()); //$NON-NLS-1$
- evalContext.addVariable("container", container); //$NON-NLS-1$
- if (container instanceof Class) evalContext.addVariable("containerClass", ((Class<?>)container).getName()); //$NON-NLS-1$
- else evalContext.addVariable("containerClass", container.getClass().getName()); //$NON-NLS-1$
+ if (container != null) {
+ evalContext.addVariable("container", container); //$NON-NLS-1$
+ if (container instanceof Class) evalContext.addVariable("containerClass", ((Class<?>)container).getName()); //$NON-NLS-1$
+ else evalContext.addVariable("containerClass", container.getClass().getName()); //$NON-NLS-1$
+ }
// Allow plugin activation
evalContext.setAllowPluginActivation(true);
// Evaluate the expression

Back to the top