Skip to content

Commit e00a3a5

Browse files
shridharkalagiSrinivasanTarget
authored andcommitted
Fixing the stopADBlog to not kill any process if pid is 0 (#31)
1 parent 2644c31 commit e00a3a5

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/main/java/com/thoughtworks/android/AndroidManager.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,17 @@ public String startADBLogWithPackage(String udid, String packageName, String fil
120120
process = cmd.execForProcessToExecute("adb -s " + udid
121121
+ " logcat | grep -F \"`adb shell ps | grep " + packageName + " | cut -c10-15`\"" + " > " + filePath);
122122
processUDIDs.put(udid, process);
123-
return "Collecting ADB logs for device " + udid + " for package "+packageName+" in file " + filePath;
123+
return "Collecting ADB logs for device " + udid + " for package " + packageName + " in file " + filePath;
124124
}
125125

126126
public String stopADBLog(String udid) throws Exception {
127127
Process p = processUDIDs.get(udid);
128-
int id = (getPid(p) > 0) ? getPid(p) : 0;
129-
cmd.runCommandThruProcess("kill -9 " + id);
130-
return "Stopped collecting ADB logs " + udid;
128+
if (getPid(p) > 0) {
129+
cmd.runCommandThruProcess("kill -9 " + getPid(p));
130+
return "Stopped collecting ADB logs " + udid;
131+
} else
132+
return "No process found to kill";
133+
131134
}
132135

133136
public int getPid(Process process) {

0 commit comments

Comments
 (0)