/**
 * Copyright 2014 Netflix, Inc.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package rx.schedulers;

/**
 * Composite class that takes a value and a timestamp and wraps them.
 */
public final class Timestamped<T> {
    private final long timestampMillis;
    private final T value;

    public Timestamped(long timestampMillis, T value) {
        this.value = value;
        this.timestampMillis = timestampMillis;
    }

    /**
     * Returns time timestamp, in milliseconds.
     * 
     * @return timestamp in milliseconds
     */
    public long getTimestampMillis() {
        return timestampMillis;
    }

    /**
     * Returns the value.
     * 
     * @return the value
     */
    public T getValue() {
        return value;
    }

    @Override
    public boolean equals(Object obj) {
        if (this == obj) {
            return true;
        }
        if (!(obj instanceof Timestamped)) {
            return false;
        }
        Timestamped<?> other = (Timestamped<?>) obj;
        if (timestampMillis != other.timestampMillis) {
            return false;
        }
        if (value == null) {
            if (other.value != null) {
                return false;
            }
        } else if (!value.equals(other.value)) {
            return false;
        }
        return true;
    }

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + (int) (timestampMillis ^ (timestampMillis));
        result = prime * result + ((value == null) ? 0 : value.hashCode());
        return result;
    }

    @Override
    public String toString() {
        return String.format("Timestamped(timestampMillis = %d, value = %s)", timestampMillis, value.toString());
    }
}

@@ -1364,32 +1364,95 @@
 true;%0A        %7D%0A
+        if (obj == null) %7B%0A            return false;%0A        %7D%0A
         if (!(ob
@@ -2057,16 +2057,23 @@
 mpMillis
+ %3E%3E%3E 32
 ));%0A    

Fix bugs in equals and hashCode