| commit | 137aecd3e470a81a9e755cafed695ae1430c10ab | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Fri Sep 18 09:24:28 2015 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Fri Sep 18 09:24:28 2015 +0000 |
| tree | 7feeb667243c2bc4c30908e443c1cbf163b5bf20 | |
| parent | a740f8ff39c8878a3b0826e925b219c405eb346d [diff] |
FELIX-5039 : Component getServices method does not return null anymore. Apply patch from Pierre De Rop git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1703788 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr-compat/changelog.txt b/scr-compat/changelog.txt index 8536207..5f18e39 100644 --- a/scr-compat/changelog.txt +++ b/scr-compat/changelog.txt
@@ -1,3 +1,9 @@ +Changes from 1.0.2 to 1.0.4 +--------------------------- +** Bug + * [FELIX-5039] Component getServices method does not return null anymore + + Changes from 1.0.0 to 1.0.2 --------------------------- ** Bug
diff --git a/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java b/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java index a641d82..70465b3 100644 --- a/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java +++ b/scr-compat/src/main/java/org/apache/felix/scr/impl/compat/ScrServiceImpl.java
@@ -219,7 +219,7 @@ public String[] getServices() { - return this.description.serviceInterfaces; + return this.description.serviceInterfaces.length == 0 ? null : this.description.serviceInterfaces; } public Dictionary getProperties()