Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F9B418950 for ; Mon, 13 Jul 2015 15:16:21 +0000 (UTC) Received: (qmail 48381 invoked by uid 500); 13 Jul 2015 15:16:21 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 48334 invoked by uid 500); 13 Jul 2015 15:16:21 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 48322 invoked by uid 99); 13 Jul 2015 15:16:21 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jul 2015 15:16:21 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 2F6A1AC0323 for ; Mon, 13 Jul 2015 15:16:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1690698 - /felix/trunk/resolver/src/test/java/org/apache/felix/resolver/test/util/GenericCapability.java Date: Mon, 13 Jul 2015 15:16:21 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150713151621.2F6A1AC0323@hades.apache.org> Author: gnodet Date: Mon Jul 13 15:16:20 2015 New Revision: 1690698 URL: http://svn.apache.org/r1690698 Log: [FELIX-4942] Capabilities should not really implements equals Modified: felix/trunk/resolver/src/test/java/org/apache/felix/resolver/test/util/GenericCapability.java Modified: felix/trunk/resolver/src/test/java/org/apache/felix/resolver/test/util/GenericCapability.java URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/test/java/org/apache/felix/resolver/test/util/GenericCapability.java?rev=1690698&r1=1690697&r2=1690698&view=diff ============================================================================== --- felix/trunk/resolver/src/test/java/org/apache/felix/resolver/test/util/GenericCapability.java (original) +++ felix/trunk/resolver/src/test/java/org/apache/felix/resolver/test/util/GenericCapability.java Mon Jul 13 15:16:20 2015 @@ -76,25 +76,4 @@ public class GenericCapability implement + getAttributes(); } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - GenericCapability that = (GenericCapability) o; - - if (!m_attrs.equals(that.m_attrs)) return false; - if (!m_dirs.equals(that.m_dirs)) return false; - if (!m_namespace.equals(that.m_namespace)) return false; - - return true; - } - - @Override - public int hashCode() { - int result = m_namespace.hashCode(); - result = 31 * result + m_dirs.hashCode(); - result = 31 * result + m_attrs.hashCode(); - return result; - } } \ No newline at end of file