/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 6a3db19d00fc in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6a3db19d00fc
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Aug 21 11:18:20 2012 +0200

	launcher/javaws.in: java is now launched by exec


changeset fbc3fe6d280a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fbc3fe6d280a
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Aug 21 12:04:56 2012 +0200

	destroyProcess in ProcessAssassin is now calling sigInt instead of unwrapped sigTerm


diffstat:

 ChangeLog                                                      |  12 +++
 launcher/javaws.in                                             |   2 +-
 tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java |  34 +++++++--
 3 files changed, 39 insertions(+), 9 deletions(-)

diffs (78 lines):

diff -r 6e84854aecba -r fbc3fe6d280a ChangeLog
--- a/ChangeLog	Sun Aug 19 16:50:30 2012 +0200
+++ b/ChangeLog	Tue Aug 21 12:04:56 2012 +0200
@@ -1,3 +1,15 @@
+2012-08-21  Jiri Vanek  <jvanek at 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 at redhat.com>
+
+	* launcher/javaws.in: java is now launched by exec
+
 2012-08-19  Thomas Meyer  <thomas at m3y3r.de>
 
 	* netx/net/sourceforge/jnlp/JNLPFile.java:
diff -r 6e84854aecba -r fbc3fe6d280a launcher/javaws.in
--- a/launcher/javaws.in	Sun Aug 19 16:50:30 2012 +0200
+++ b/launcher/javaws.in	Tue Aug 21 12:04:56 2012 +0200
@@ -59,6 +59,6 @@
   k=$((k+1))
 done
 
-"${COMMAND[@]}"
+exec -a "javaws" "${COMMAND[@]}"
 
 exit $?
diff -r 6e84854aecba -r fbc3fe6d280a tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java
--- a/tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java	Sun Aug 19 16:50:30 2012 +0200
+++ b/tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java	Tue Aug 21 12:04:56 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);
+    }
 }