From df4f842f524c375cad39be9a705f8d210e1e56f1 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Fri, 30 Mar 2012 13:06:30 +0100
Subject: [PATCH] fixes for more excellent Stepan feedback :)

---
 libraries/stdlib/src/kotlin/Ordering.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/stdlib/src/kotlin/Ordering.kt b/libraries/stdlib/src/kotlin/Ordering.kt
index eec34219129..25e7fa95d32 100644
--- a/libraries/stdlib/src/kotlin/Ordering.kt
+++ b/libraries/stdlib/src/kotlin/Ordering.kt
@@ -15,7 +15,7 @@ inline fun <T> compareBy(a: T?, b: T?, vararg functions: Function1<T, Any?>): In
         val v1 = fn(a)
         val v2 = fn(b)
         val diff = compareValues(v1, v2)
-        if (diff != null) return diff
+        if (diff != 0) return diff
     }
     return 0
 }
@@ -26,6 +26,7 @@ inline fun <T> compareBy(a: T?, b: T?, vararg functions: Function1<T, Any?>): In
  * the [[#hashCode()]] method is used as the difference
  */
 public inline fun <T> compareValues(a: T?, b: T?): Int {
+    if (a === b) return 0
     if (a == null) return - 1
     if (b == null) return 1
     if (a is Comparable<T>) {