aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/nio/ByteBuffer.java3
2 files changed, 6 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1e57919..607d1f8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
2003-11-11 Michael Koch <konqueror@gmx.de>
+ * java/nio/ByteBuffer.java
+ (equals): Remove redundant obj == null check.
+
+2003-11-11 Michael Koch <konqueror@gmx.de>
+
* gnu/java/nio/natPipeImpl.cc,
gnu/java/nio/natSelectorImpl.cc: Removed
* gnu/java/nio/natPipeImplEcos.cc,
diff --git a/libjava/java/nio/ByteBuffer.java b/libjava/java/nio/ByteBuffer.java
index 1727b41..3be7977 100644
--- a/libjava/java/nio/ByteBuffer.java
+++ b/libjava/java/nio/ByteBuffer.java
@@ -278,8 +278,7 @@ public abstract class ByteBuffer extends Buffer
*/
public boolean equals (Object obj)
{
- if (obj != null &&
- obj instanceof ByteBuffer)
+ if (obj instanceof ByteBuffer)
{
return compareTo (obj) == 0;
}