Merge pull request #1063 from zsxwing/Timestamped-bug

Fix bugs in equals and hashCode of Timestamped

Author: benjchristensen

rxjava-core/src/main/java/rx/schedulers/Timestamped.java

@@ -50,6 +50,9 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
+        if (obj == null) {
+            return false;
+        }
         if (!(obj instanceof Timestamped)) {
             return false;
         }
@@ -71,7 +74,7 @@ public boolean equals(Object obj) {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + (int) (timestampMillis ^ (timestampMillis));
+        result = prime * result + (int) (timestampMillis ^ (timestampMillis >>> 32));
         result = prime * result + ((value == null) ? 0 : value.hashCode());
         return result;
     }