[rvm-commits] code: RVM-1028 : Patch GNU Classpath's VMProcess to use notifyAl...

[<jik...@li...>]

details:   http://hg.code.sourceforge.net/p/jikesrvm/code/rev/1605c70fd077
changeset: 10628:1605c70fd077
user:      Erik Brangs <eri...@gm...>
date:      Mon Apr 29 09:42:33 2013 +0200
description:
RVM-1028 : Patch GNU Classpath's VMProcess to use notifyAll() instead of notify() (original patches by Carl Ritson). This bug is tracked upstream as PR57070 at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57070.


diffstat:

 build/components/classpath.xml                        |   6 +++-
 build/components/patches/classpath-git.RVM-1028.patch |  29 +++++++++++++++++++
 build/components/patches/classpath-web.RVM-1028.patch |  29 +++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletions(-)

diffs (98 lines):

diff --git a/build/components/classpath.xml b/build/components/classpath.xml
--- a/build/components/classpath.xml
+++ b/build/components/classpath.xml
@@ -19,7 +19,7 @@
   <!-- in target patch-classpath-web                                -->
   <property name="classpath.version" value="97.2"/>
   <!-- Change this whenever you alter the patches. It will let people know classpath has changed. -->
-  <property name="classpath.patchlevel" value="13"/>
+  <property name="classpath.patchlevel" value="14"/>
   <property name="classpath.description" value="GNU Classpath"/>
 
   <property name="classpath.component.dir" location="${components.dir}/classpath"/>
@@ -119,6 +119,8 @@
            dir="${classpath.package.dir}/classpath/" strip="0"/>
     <patch patchfile="${components.patch.dir}/classpath-git.RVM-903.patch"
            dir="${classpath.package.dir}/classpath/" strip="1"/>
+    <patch patchfile="${components.patch.dir}/classpath-git.RVM-1028.patch"
+           dir="${classpath.package.dir}/classpath/" strip="0"/>
   </target>
 
   <!-- Patches against the current stable version -->
@@ -191,6 +193,8 @@
            dir="${classpath.package.dir}/classpath/" strip="1"/>
     <patch patchfile="${components.patch.dir}/classpath-web.RVM-1003.patch"
            dir="${classpath.package.dir}/classpath/" strip="0"/>
+    <patch patchfile="${components.patch.dir}/classpath-web.RVM-1028.patch"
+           dir="${classpath.package.dir}/classpath/" strip="0"/>
   </target>
   <target name="patch" depends="patch-classpath-web,patch-classpath-git"/>
 
diff --git a/build/components/patches/classpath-git.RVM-1028.patch b/build/components/patches/classpath-git.RVM-1028.patch
new file mode 100644
--- /dev/null
+++ b/build/components/patches/classpath-git.RVM-1028.patch
@@ -0,0 +1,29 @@
+--- vm/reference/java/lang/VMProcess.java
++++ vm/reference/java/lang/VMProcess.java
+@@ -152,7 +152,7 @@ final class VMProcess extends Process
+                     {
+                       process.exitValue = exitValue;
+                       process.state = TERMINATED;
+-                      process.notify();
++                      process.notifyAll();
+                     }
+                 }
+               else
+@@ -214,7 +214,7 @@ final class VMProcess extends Process
+               process.state = TERMINATED;
+               process.exception = t;
+             }
+-          process.notify();
++          process.notifyAll();
+         }
+     }
+   }
+@@ -243,7 +243,7 @@ final class VMProcess extends Process
+           }
+         else
+           {
+-            workList.notify();
++            workList.notifyAll();
+           }
+       }
+ 
diff --git a/build/components/patches/classpath-web.RVM-1028.patch b/build/components/patches/classpath-web.RVM-1028.patch
new file mode 100644
--- /dev/null
+++ b/build/components/patches/classpath-web.RVM-1028.patch
@@ -0,0 +1,29 @@
+--- vm/reference/java/lang/VMProcess.java	2006-09-05 22:33:25.000000000 +0100
++++ vm/reference/java/lang/VMProcess.java	2013-04-25 20:59:20.318705390 +0100
+@@ -152,7 +152,7 @@
+ 		    {
+ 		      process.exitValue = exitValue;
+ 		      process.state = TERMINATED;
+-		      process.notify();
++		      process.notifyAll();
+ 		    }
+ 		}
+ 	      else
+@@ -214,7 +214,7 @@
+ 	      process.state = TERMINATED;
+ 	      process.exception = t;
+ 	    }
+-	  process.notify();
++	  process.notifyAll();
+ 	}
+     }
+   }
+@@ -243,7 +243,7 @@
+ 	  }
+ 	else
+ 	  {
+-	    workList.notify();
++	    workList.notifyAll();
+ 	  }
+       }
+