mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 02:36:01 +02:00
Code Issues Wiki Activity

Merge branch 'R2_0_maintenance'

Browse source
This commit is contained in:
Greg Watson 2015-06-26 11:54:59 -04:00
commit cea4bd4eb3
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bundles/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleConnector.java
View file

@ -46,9 +46,12 @@ public class TerminalConsoleConnector {
public OutThread() {
super("Terminal Output"); //$NON-NLS-1$
}
@Override
public void run() {
try {
byte[] buff = new byte[1024];
if (remoteProcess != null) {
InputStream in = remoteProcess.getInputStream();
for (int n = in.read(buff); n >= 0; n = in.read(buff)) {
for (PageConnector connector : pageConnectors) {
@ -58,6 +61,7 @@ public class TerminalConsoleConnector {
}
}
}
}
setState(TerminalState.CLOSED);
synchronized (TerminalConsoleConnector.this) {
outThread = null;
@ -67,6 +71,7 @@ public class TerminalConsoleConnector {
}
}
}
private OutThread outThread;
public TerminalConsoleConnector(IRemoteConnection connection) {
@ -153,7 +158,7 @@ public class TerminalConsoleConnector {
}
public void disconnect() {
if (!remoteProcess.isCompleted()) {
if (remoteProcess != null && !remoteProcess.isCompleted()) {
new Job(ConsoleMessages.DISCONNECTING) {
@Override
protected IStatus run(IProgressMonitor monitor) {
@ -200,7 +205,7 @@ public class TerminalConsoleConnector {
@Override
public OutputStream getTerminalToRemoteStream() {
return remoteProcess.getOutputStream();
return remoteProcess != null ? remoteProcess.getOutputStream() : null;
}
@Override

16
bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java
View file

@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.remote.internal.core;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
@ -127,11 +129,21 @@ public class RemoteConnection implements IRemoteConnection {
}
Preferences getPreferences() {
return connectionType.getPreferenceNode().node(name);
try {
return connectionType.getPreferenceNode().node(URLEncoder.encode(name, "UTF-8")); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
// Should not happen!
throw new RuntimeException(e);
}
}
ISecurePreferences getSecurePreferences() {
return connectionType.getSecurePreferencesNode().node(name);
try {
return connectionType.getSecurePreferencesNode().node(URLEncoder.encode(name, "UTF-8")); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
// Should not happen!
throw new RuntimeException(e);
}
}
/*