Author: tjwatson
Date: Wed May 25 15:50:23 2016
New Revision: 1745511
URL: http://svn.apache.org/viewvc?rev=1745511&view=rev
Log:
[ARIES-1554] FelixResourceAdapter returns true for resources of other types
Modified:
aries/trunk/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
Modified:
aries/trunk/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java?rev=1745511&r1=1745510&r2=1745511&view=diff
==============================================================================
---
aries/trunk/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
(original)
+++
aries/trunk/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixResourceAdapter.java
Wed May 25 15:50:23 2016
@@ -39,9 +39,9 @@ public class FelixResourceAdapter implem
public boolean equals(Object o) {
if (o == this)
return true;
- if (!(o instanceof Resource))
+ if (!(o instanceof FelixResourceAdapter))
return false;
- Resource that = (Resource)o;
+ FelixResourceAdapter that = (FelixResourceAdapter)o;
if
(!ResourceHelper.getTypeAttribute(that).equals(ResourceHelper.getTypeAttribute(this)))
return false;
if
(!ResourceHelper.getSymbolicNameAttribute(that).equals(ResourceHelper.getSymbolicNameAttribute(this)))