From 655b0625fa801fa8fc8e91d7b08300ada531c34e Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Wed, 11 Jan 2012 23:02:18 +0000
Subject: Make encoding strategy equals method symmetric in the face of
 subclassing.

---
 src/main/java/com/amazon/carbonado/raw/CompressedEncodingStrategy.java | 2 +-
 src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/amazon/carbonado')

diff --git a/src/main/java/com/amazon/carbonado/raw/CompressedEncodingStrategy.java b/src/main/java/com/amazon/carbonado/raw/CompressedEncodingStrategy.java
index c8e913e..42bd9e3 100644
--- a/src/main/java/com/amazon/carbonado/raw/CompressedEncodingStrategy.java
+++ b/src/main/java/com/amazon/carbonado/raw/CompressedEncodingStrategy.java
@@ -83,7 +83,7 @@ public class CompressedEncodingStrategy<S extends Storable> extends GenericEncod
         if (this == obj) {
             return true;
         }
-        if (CompressedEncodingStrategy.class.equals(obj)) {
+        if (obj != null && obj.getClass() == this.getClass()) {
             CompressedEncodingStrategy other = (CompressedEncodingStrategy) obj;
             return super.equals(obj) && mCompressionType.equals(other.mCompressionType);
         }
diff --git a/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java b/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
index 6f3139e..ef8ef84 100644
--- a/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
+++ b/src/main/java/com/amazon/carbonado/raw/GenericEncodingStrategy.java
@@ -424,7 +424,7 @@ public class GenericEncodingStrategy<S extends Storable> {
         if (this == obj) {
             return true;
         }
-        if (GenericEncodingStrategy.class.equals(obj)) {
+        if (obj != null && obj.getClass() == this.getClass()) {
             GenericEncodingStrategy other = (GenericEncodingStrategy) obj;
             return mType == other.mType
                 && mKeyPrefixPadding == other.mKeyPrefixPadding
-- 
cgit v1.2.3