deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make sure compilation process is killed when simulation load is aborted

Browse source
This commit is contained in:
fros4943 2009-03-21 16:44:29 +00:00
parent fa09bd6c69
commit fee88cb042
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/cooja/java/se/sics/cooja/dialogs/CompileContiki.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: CompileContiki.java,v 1.2 2009/03/10 21:20:08 fros4943 Exp $ * $Id: CompileContiki.java,v 1.3 2009/03/21 16:44:29 fros4943 Exp $
*/ */
package se.sics.cooja.dialogs; package se.sics.cooja.dialogs;
@ -201,8 +201,15 @@ public class CompileContiki {
try { try {
handleCompilationResultThread.join(); handleCompilationResultThread.join();
} catch (Exception e) { } catch (Exception e) {
/* Make sure process has exited */
compileProcess.destroy();
String msg = e.getMessage();
if (e instanceof InterruptedException) {
msg = "Aborted by user";
}
throw (MoteTypeCreationException) new MoteTypeCreationException( throw (MoteTypeCreationException) new MoteTypeCreationException(
"Compilation error: " + e.getMessage()).initCause(e); "Compilation error: " + msg).initCause(e);
} }
/* Detect error manually */ /* Detect error manually */