/hg/release/icedtea-web-1.3: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset cea32b6fa36a in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=cea32b6fa36a
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Aug 21 11:19:38 2012 +0200

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


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

	destroyProcess in ProcessAssasin 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 3564e46e0a4f -r f9ce023d1bf2 ChangeLog
--- a/ChangeLog	Fri Aug 17 11:53:07 2012 -0400
+++ b/ChangeLog	Tue Aug 21 12:02:00 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-17  Adam Domurad  <adomurad at redhat.com>
 
 	Fixes PR588, cookies set in the java cookie jar are now stored properly
diff -r 3564e46e0a4f -r f9ce023d1bf2 launcher/javaws.in
--- a/launcher/javaws.in	Fri Aug 17 11:53:07 2012 -0400
+++ b/launcher/javaws.in	Tue Aug 21 12:02:00 2012 +0200
@@ -59,6 +59,6 @@
   k=$((k+1))
 done
 
-"${COMMAND[@]}"
+exec -a "javaws" "${COMMAND[@]}"
 
 exit $?
diff -r 3564e46e0a4f -r f9ce023d1bf2 tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java
--- a/tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java	Fri Aug 17 11:53:07 2012 -0400
+++ 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);
+    }
 }