From 696f77beb5f07221d96de248994d129a383ae844 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Wed, 11 Aug 2010 20:34:27 +0000 Subject: [PATCH] Fix possible ClassCastException, because DSet.contains(E entry) will type-erase to DSet.Entry. Ensure objects tested for containment in our Set view implement that. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6128 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/dobj/DSet.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java index c1c761cc0..b667f8c22 100644 --- a/src/java/com/threerings/presents/dobj/DSet.java +++ b/src/java/com/threerings/presents/dobj/DSet.java @@ -272,6 +272,9 @@ public class DSet throw new UnsupportedOperationException(); } @Override public boolean contains (Object o) { + if (!(o instanceof DSet.Entry)) { + return false; + } @SuppressWarnings("unchecked") E elem = (E)o; return DSet.this.contains(elem); }