diff options
| author | Anton Leherbauer | 2015-03-26 08:49:00 +0000 |
|---|---|---|
| committer | Anton Leherbauer | 2015-03-26 08:49:24 +0000 |
| commit | 1d8bbfd5561cc0900a1334dce3766ea691703e9a (patch) | |
| tree | 4991d2ffd25fe41ec22137c3fb9e4f8ca3dc8262 | |
| parent | d2f28632e8c1d088446d5e24b012ad4bd8cfa8fb (diff) | |
| download | org.eclipse.tcf-1d8bbfd5561cc0900a1334dce3766ea691703e9a.tar.gz org.eclipse.tcf-1d8bbfd5561cc0900a1334dce3766ea691703e9a.tar.xz org.eclipse.tcf-1d8bbfd5561cc0900a1334dce3766ea691703e9a.zip | |
Terminals: Fix NPE in TabFolderManager.createTabItem if flags==null
| -rw-r--r-- | terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java index 41e53b33a..9e4c96a0c 100644 --- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java +++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java @@ -272,8 +272,8 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid // Create the terminal control ITerminalViewControl terminal = TerminalViewControlFactory.makeControl(doCreateTerminalTabTerminalListener(this, item), composite, new ITerminalConnector[] { connector }, true); - if (terminal instanceof ITerminalControl && flags.containsKey(ITerminalsConnectorConstants.PROP_DATA_NO_RECONNECT)) { - Object value = flags.get(ITerminalsConnectorConstants.PROP_DATA_NO_RECONNECT); + if (terminal instanceof ITerminalControl) { + Object value = flags != null ? flags.get(ITerminalsConnectorConstants.PROP_DATA_NO_RECONNECT) : null; boolean noReconnect = value instanceof Boolean ? ((Boolean)value).booleanValue() : false; ((ITerminalControl)terminal).setConnectOnEnterIfClosed(!noReconnect); } |