From c7ce640a783201fd3d5c5fc4ec5beeb63fe7e3f7 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 14 Jul 2010 18:51:40 +0000
Subject: [PATCH] Prefer Guava to Samskivert.

---
 src/java/com/samskivert/depot/impl/SimpleCacheKey.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/java/com/samskivert/depot/impl/SimpleCacheKey.java b/src/java/com/samskivert/depot/impl/SimpleCacheKey.java
index bbf2881..2e8b635 100644
--- a/src/java/com/samskivert/depot/impl/SimpleCacheKey.java
+++ b/src/java/com/samskivert/depot/impl/SimpleCacheKey.java
@@ -23,7 +23,8 @@ package com.samskivert.depot.impl;
 import java.io.Serializable;
 
 import com.samskivert.depot.CacheKey;
-import com.samskivert.util.ObjectUtil;
+
+import com.google.common.base.Objects;
 
 /**
  * Convenience class that implements {@link CacheKey} as simply as possibly. This class is
@@ -71,8 +72,8 @@ public class SimpleCacheKey
             return false;
         }
         SimpleCacheKey other = (SimpleCacheKey) obj;
-        return ObjectUtil.equals(_cacheId, other._cacheId) &&
-            ObjectUtil.equals(_cacheKey, other._cacheKey);
+        return Objects.equal(_cacheId, other._cacheId) &&
+            Objects.equal(_cacheKey, other._cacheKey);
     }
 
     @Override