summaryrefslogtreecommitdiff
path: root/libjava/classpath/java/util/AbstractMap.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath/java/util/AbstractMap.java')
-rw-r--r--libjava/classpath/java/util/AbstractMap.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/classpath/java/util/AbstractMap.java b/libjava/classpath/java/util/AbstractMap.java
index 7cd6436a308..b4ab882addf 100644
--- a/libjava/classpath/java/util/AbstractMap.java
+++ b/libjava/classpath/java/util/AbstractMap.java
@@ -594,13 +594,13 @@ public abstract class AbstractMap implements Map
*
* @param o1 the first object
* @param o2 the second object
- * @return o1 == null ? o2 == null : o1.equals(o2)
+ * @return o1 == o2 || (o1 != null && o1.equals(o2))
*/
// Package visible for use throughout java.util.
// It may be inlined since it is final.
static final boolean equals(Object o1, Object o2)
{
- return o1 == null ? o2 == null : o1.equals(o2);
+ return o1 == o2 || (o1 != null && o1.equals(o2));
}
/**