Fixed parsing RSE output of RuntimeProcessFactory.

1 files changed, 23 insertions, 2 deletions

diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/RuntimeProcessFactory.java b/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/RuntimeProcessFactory.java
index 890f2f0..2a289e0 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/RuntimeProcessFactory.java
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/RuntimeProcessFactory.java
@@ -119,15 +119,36 @@ public class RuntimeProcessFactory extends LinuxtoolsProcessFactory {
 				Process pProxy = launcher.execute(whichPath, new String[]{command}, envp, null, new NullProgressMonitor());
 				if (pProxy != null){
 					BufferedReader error = new BufferedReader(new InputStreamReader(pProxy.getErrorStream()));
+					BufferedReader reader = new BufferedReader(new InputStreamReader(pProxy.getInputStream()));
 					if(error.readLine() != null){
 						throw new IOException(error.readLine());
 					}
-					BufferedReader reader = new BufferedReader(new InputStreamReader(pProxy.getInputStream()));
+					error.close();
 					String readLine = reader.readLine();
-					command = readLine;
+					ArrayList<String> lines = new ArrayList<String>();
+					while (readLine != null) {
+						lines.add(readLine);
+						readLine = reader.readLine();
+					}
+					reader.close();
+					if (project.getLocationURI()!=null) {
+						if(project.getLocationURI().toString().startsWith("rse:")) { //$NON-NLS-1$
+							// RSE output
+							command = lines.get(lines.size()-2);
+						} else {
+							// Remotetools output
+							command = lines.get(0);
+						}
+					} else {
+						// Local output
+						command = lines.get(0);
+					}
 				}
 			} catch (CoreException e) {
 				e.printStackTrace();
+			} catch (IndexOutOfBoundsException e) {
+				// Executable cannot be found in system path.
+				e.printStackTrace();
 			}
 		}
 		return command;