[Esbox-commits] r1834 - branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-07-01 19:42:17 +0300 (Wed, 01 Jul 2009)
New Revision: 1834

Modified:
   branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java
Log:
Still couldn't kill that Maemo AF process, so modify API so we can actually tell which IProcessMonitor is associated with an IStreamMonitor and kill the process through that.

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java	2009-06-30 22:38:28 UTC (rev 1833)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/AfSbInitMaemoLauncherAdapter.java	2009-07-01 16:42:17 UTC (rev 1834)
@@ -207,17 +207,7 @@
 
 			// And watch for errors and termination
 			IStreamMonitor errorMonitor = new StreamLineMonitorAdapter() {
-				private Process theProcess;
-				
 				/* (non-Javadoc)
-				 * @see org.maemo.mica.common.core.process.StreamMonitorAdapter#processCreated(java.lang.Process)
-				 */
-				@Override
-				public void processCreated(Process process) {
-					super.processCreated(process);
-					theProcess = process;
-				}
-				/* (non-Javadoc)
 				 * @see org.maemo.mica.common.core.process.IStreamLineMonitor#handleLine(java.lang.String, boolean)
 				 */
 				public void handleLine(String text, boolean errorStream)
@@ -239,7 +229,7 @@
 									Thread.sleep(30000);
 								} catch (InterruptedException e) {
 								}
-								theProcess.destroy();
+								procMonitor.terminate();
 								return Status.OK_STATUS;
 							}