0f209a04eea8d91f7dd99903a479069ecc2891a6 - onos-felix

commit	0f209a04eea8d91f7dd99903a479069ecc2891a6	[log] [tgz]
author	Clement Escoffier <clement@apache.org>	Wed Dec 03 13:25:22 2014 +0000
committer	Clement Escoffier <clement@apache.org>	Wed Dec 03 13:25:22 2014 +0000
tree	896f94710a9edfd029038bf635cc9fb115719607
parent	7c4a80f30d0737a87e506e75c8ad89b7eb1c4bbe [diff]

Fix FELIX-4717
Distinguish two classes to handle the method conflict.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1643110 13f79535-47bb-0310-9956-ffa450edef68

ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java[diff]
ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceList.java[Renamed from ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceCollection.java - diff]
ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceSet.java[Copied from ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceCollection.java - diff]

3 files changed