Mercurial > hg > release > icedtea-web-1.3
changeset 485:f9ce023d1bf2
destroyProcess in ProcessAssasin is now calling sigInt instead of unwrapped sigTerm
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Tue, 21 Aug 2012 12:02:00 +0200 |
parents | cea32b6fa36a |
children | cfad6b012cbf |
files | ChangeLog tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java |
diffstat | 2 files changed, 34 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 21 11:19:38 2012 +0200 +++ b/ChangeLog Tue Aug 21 12:02:00 2012 +0200 @@ -1,3 +1,11 @@ +2012-08-21 Jiri Vanek <jvanek@redhat.com> + + * tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java: + (sigInt), (sigKill), (sigTerm) new methods for various killing of + processes by kill. + (kill) new method, launching kill process. + (destroyProcess ) is now calling sigInt instead of unwrapped sigTerm. + 2012-08-21 Jiri Vanek <jvanek@redhat.com> * launcher/javaws.in: java is now launched by exec
--- a/tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java Tue Aug 21 11:19:38 2012 +0200 +++ b/tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java Tue Aug 21 12:02:00 2012 +0200 @@ -166,18 +166,36 @@ Field f = p.getClass().getDeclaredField("pid"); f.setAccessible(true); String pid = (f.get(p)).toString(); - List<String> ll=new ArrayList<String>(4); - ll.add("kill"); - ll.add("-s"); - ll.add("SIGTERM"); - ll.add(pid); - ServerAccess.executeProcess(ll);//sync, but acctually release - //before affected application close - Thread.sleep(1000); + sigInt(pid); + //sigTerm(pid); + //sigKill(pid); } catch (Exception ex) { ServerAccess.logException(ex); } finally { p.destroy(); } } + + public static void sigInt(String pid) throws Exception { + kill(pid, "SIGINT"); + } + + public static void sigKill(String pid) throws Exception { + kill(pid, "SIGKILL"); + } + + public static void sigTerm(String pid) throws Exception { + kill(pid, "SIGTERM"); + } + + public static void kill(String pid,String signal) throws InterruptedException, Exception { + List<String> ll = new ArrayList<String>(4); + ll.add("kill"); + ll.add("-s"); + ll.add(signal); + ll.add(pid); + ServerAccess.executeProcess(ll); //sync, but acctually release + //before affected application close + Thread.sleep(1000); + } }