Attachment 96488 Details for Bug 227629 – PTY NPE fix for Windows

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] PTY NPE fix for Windows

gdblaunch.patch (text/plain), 2.23 KB, created by Randy Rohrbach

on 2008-04-17 15:19:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Randy Rohrbach

Created: 2008-04-17 15:19:41 EDT

Size: 2.23 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dd.gdb
>Index: src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java,v
>retrieving revision 1.5
>diff -u -r1.5 GDBControl.java
>--- src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	12 Apr 2008 01:16:56 -0000	1.5
>+++ src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	17 Apr 2008 19:14:26 -0000
>@@ -263,7 +263,12 @@
>     }
>     
>     public String getPtyName() {
>-    	return fPty.getSlaveName();
>+    	if ( fPty != null ) {
>+    		return fPty.getSlaveName();
>+    	}
>+    	else {
>+    		return null;
>+    	}
>     }
>         
>     @DsfServiceEventHandler 
>Index: src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java,v
>retrieving revision 1.6
>diff -u -r1.6 FinalLaunchSequence.java
>--- src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java	15 Apr 2008 16:38:17 -0000	1.6
>+++ src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java	17 Apr 2008 19:14:26 -0000
>@@ -76,9 +76,15 @@
>         		boolean useTerminal = fLaunch.getLaunchConfiguration().getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, true);
>         		
>         		if (useTerminal) {
>+        			String pytName = fCommandControl.getPtyName();
>+        			if ( pytName != null ) {
>             		fCommandControl.queueCommand(
>-         				new MIInferiorTTYSet(fCommandControl.getControlDMContext(), fCommandControl.getPtyName()), 
>+         				new MIInferiorTTYSet(fCommandControl.getControlDMContext(), pytName), 
>      					new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
>+        			}
>+        			else {
>+        				requestMonitor.done();
>+        			}
>         		} else {
>         			requestMonitor.done();
>         		}

Flags:

cdtdoug: iplog-

Actions: View | Diff

Attachments on bug 227629: 96488