[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4192 
Date: 2003/12/04 01:30:31
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

2003-12-04  Dalibor Topic <robilad at kaffe.org>

        * libraries/javalib/java/net/Inet4Address.java,
        libraries/javalib/java/net/Inet6Address.java,
        libraries/javalib/java/rmi/MarshalledObject.java,
        libraries/javalib/java/rmi/server/RMIClassLoader.java,
        libraries/javalib/javax/naming/CompoundName.java:
        Resynced with GNU Classpath.

        2003-11-15  Michael Koch  <konqueror at gmx.de>

        * java/net/Inet4Address.java,
        java/net/Inet6Address.java,
        java/rmi/MarshalledObject.java,
        java/rmi/server/RMIClassLoader.java,
        javax/naming/CompoundName.java (equals):
        Removed some redundant obj == null checks.

Members: 
	ChangeLog:1.1783->1.1784 
	libraries/javalib/java/net/Inet4Address.java:1.4->1.5 
	libraries/javalib/java/net/Inet6Address.java:1.2->1.3 
	libraries/javalib/java/rmi/MarshalledObject.java:1.2->1.3 
	libraries/javalib/java/rmi/server/RMIClassLoader.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1783 kaffe/ChangeLog:1.1784
--- kaffe/ChangeLog:1.1783	Wed Dec  3 23:55:36 2003
+++ kaffe/ChangeLog	Thu Dec  4 01:30:31 2003
@@ -1,3 +1,21 @@
+2003-12-04  Dalibor Topic <robilad at kaffe.org>
+
+	* libraries/javalib/java/net/Inet4Address.java,
+	libraries/javalib/java/net/Inet6Address.java,
+	libraries/javalib/java/rmi/MarshalledObject.java,
+	libraries/javalib/java/rmi/server/RMIClassLoader.java,
+	libraries/javalib/javax/naming/CompoundName.java:
+	Resynced with GNU Classpath.	
+
+	2003-11-15  Michael Koch  <konqueror at gmx.de>
+
+	* java/net/Inet4Address.java,
+        java/net/Inet6Address.java,
+        java/rmi/MarshalledObject.java,
+        java/rmi/server/RMIClassLoader.java,
+        javax/naming/CompoundName.java (equals):
+        Removed some redundant obj == null checks.
+
 2003-12-03  Dalibor Topic <robilad at kaffe.org>
 
 	* libraries/javalib/java/net/InetSocketAddress.java:
Index: kaffe/libraries/javalib/java/net/Inet4Address.java
diff -u kaffe/libraries/javalib/java/net/Inet4Address.java:1.4 kaffe/libraries/javalib/java/net/Inet4Address.java:1.5
--- kaffe/libraries/javalib/java/net/Inet4Address.java:1.4	Sat Nov 22 18:50:15 2003
+++ kaffe/libraries/javalib/java/net/Inet4Address.java	Thu Dec  4 01:30:32 2003
@@ -258,7 +258,7 @@
    */
   public boolean equals (Object obj)
   {
-    if (obj == null || ! (obj instanceof InetAddress))
+    if (! (obj instanceof InetAddress))
       return false;
     
     byte[] addr1 = addr;
Index: kaffe/libraries/javalib/java/net/Inet6Address.java
diff -u kaffe/libraries/javalib/java/net/Inet6Address.java:1.2 kaffe/libraries/javalib/java/net/Inet6Address.java:1.3
--- kaffe/libraries/javalib/java/net/Inet6Address.java:1.2	Tue Oct 28 12:29:38 2003
+++ kaffe/libraries/javalib/java/net/Inet6Address.java	Thu Dec  4 01:30:32 2003
@@ -243,7 +243,7 @@
    */
   public boolean equals (Object obj)
   {
-    if (obj == null || ! (obj instanceof Inet6Address))
+    if (! (obj instanceof Inet6Address))
       return false;
 
     Inet6Address tmp = (Inet6Address) obj;
Index: kaffe/libraries/javalib/java/rmi/MarshalledObject.java
diff -u kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.2 kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.3
--- kaffe/libraries/javalib/java/rmi/MarshalledObject.java:1.2	Mon Aug 18 17:40:34 2003
+++ kaffe/libraries/javalib/java/rmi/MarshalledObject.java	Thu Dec  4 01:30:33 2003
@@ -76,7 +76,7 @@
   
   public boolean equals(Object obj) 
   {
-    if(obj == null || !(obj instanceof MarshalledObject) )
+    if (! (obj instanceof MarshalledObject))
       return false;
 
     // hashCode even differs, don't do the time-consuming comparisons
Index: kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java
diff -u kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.4 kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.5
--- kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java:1.4	Wed Oct 22 10:34:57 2003
+++ kaffe/libraries/javalib/java/rmi/server/RMIClassLoader.java	Thu Dec  4 01:30:33 2003
@@ -113,8 +113,7 @@
      */
     public boolean equals (Object theOther)
     {
-      if (theOther != null
-          && theOther instanceof CacheKey)
+      if (theOther instanceof CacheKey)
       {
       	CacheKey key = (CacheKey) theOther;