Merge with head

codehaus · Mar 16, 2009 · ffdb2c9 · ffdb2c9
2 parents 047161c + ce15478
commit ffdb2c9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/libraryInterface/Common/src/java/lang/Class.java b/libraryInterface/Common/src/java/lang/Class.java
@@ -557,7 +557,7 @@ private static boolean validArrayDescriptor(String name) {
   @NoInline
   private void throwNoSuchMethodException(String name, Class<?>... parameterTypes) throws NoSuchMethodException {
     String typeString;
-    if (parameterTypes.length == 0) {
+    if (parameterTypes == null || parameterTypes.length == 0) {
       typeString = "()";
     } else {
       typeString = "(";

diff --git a/rvm/src/org/jikesrvm/runtime/BootRecord.java b/rvm/src/org/jikesrvm/runtime/BootRecord.java
@@ -254,7 +254,7 @@ public void setHeapRange(int id, Address start, Address end) {
   public Address sysThreadSelfIP;
   public Address sysStashVMThreadIP;
   public Address sysThreadTerminateIP;
-  
+
   // monitors
   public Address sysMonitorCreateIP;
   public Address sysMonitorDestroyIP;

diff --git a/rvm/src/org/jikesrvm/runtime/SysCall.java b/rvm/src/org/jikesrvm/runtime/SysCall.java
@@ -132,7 +132,7 @@ public abstract class SysCall {
 
   @SysCallTemplate
   public abstract boolean sysMemoryDecommit(Address start, Extent length);
-  
+
   @SysCallTemplate
   public abstract int sysGetPageSize();
 

diff --git a/rvm/src/org/jikesrvm/scheduler/RVMThread.java b/rvm/src/org/jikesrvm/scheduler/RVMThread.java
@@ -62,7 +62,6 @@
 import org.vmmagic.pragma.Untraced;
 import org.vmmagic.pragma.NoCheckStore;
 import org.vmmagic.unboxed.Address;
-import org.vmmagic.unboxed.Word;
 import org.vmmagic.unboxed.Offset;
 import static org.jikesrvm.runtime.SysCall.sysCall;
 import org.jikesrvm.classloader.RVMMethod;

diff --git a/rvm/src/org/jikesrvm/tools/header_gen/GenerateInterfaceDeclarations.java b/rvm/src/org/jikesrvm/tools/header_gen/GenerateInterfaceDeclarations.java
@@ -22,7 +22,6 @@
 import org.jikesrvm.classloader.RVMField;
 import org.jikesrvm.classloader.TypeReference;
 import org.jikesrvm.objectmodel.ObjectModel;
-import org.jikesrvm.objectmodel.ThinLockConstants;
 import org.jikesrvm.runtime.ArchEntrypoints;
 import org.jikesrvm.runtime.Entrypoints;
 import org.jikesrvm.runtime.RuntimeEntrypoints;