Author: rotty3000
Date: Wed Jan 16 15:51:23 2019
New Revision: 1851460
URL: http://svn.apache.org/viewvc?rev=1851460&view=rev
Log:
FELIX-5974 Restore Java 6 compatibility, committed for Daniel Reuther
<daniel.reut...@liferay.com>
Modified:
felix/branches/scr-2.0.x/scr/changelog.txt
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/MultiplePrototypeRefPair.java
Modified: felix/branches/scr-2.0.x/scr/changelog.txt
URL:
http://svn.apache.org/viewvc/felix/branches/scr-2.0.x/scr/changelog.txt?rev=1851460&r1=1851459&r2=1851460&view=diff
==============================================================================
--- felix/branches/scr-2.0.x/scr/changelog.txt (original)
+++ felix/branches/scr-2.0.x/scr/changelog.txt Wed Jan 16 15:51:23 2019
@@ -1,3 +1,11 @@
+Changes from 2.0.14 to 2.0.16
+-----------------------------
+** Bug
+ * [FELIX-5947] - ClassLoader memory leak
+ * [FELIX-5950] - NPE in MultiplePrototypeRefPair.unsetServiceObject
+ * [FELIX-5974] - Prototype scope references are not released on
deactivation
+
+
Changes in 2.1.14
-----------------
** Bug
Modified:
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
URL:
http://svn.apache.org/viewvc/felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1851460&r1=1851459&r2=1851460&view=diff
==============================================================================
---
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
(original)
+++
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Wed Jan 16 15:51:23 2019
@@ -2242,9 +2242,9 @@ public class DependencyManager<S, T> imp
}
if (m_componentManager.getComponentMetadata().getServiceScope() ==
Scope.singleton)
{
- return new SinglePrototypeRefPair<>(serviceReference);
+ return new SinglePrototypeRefPair<S, T>(serviceReference);
}
- return new MultiplePrototypeRefPair<>(serviceReference);
+ return new MultiplePrototypeRefPair<S, T>(serviceReference);
}
private void deactivateComponentManager()
Modified:
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/MultiplePrototypeRefPair.java
URL:
http://svn.apache.org/viewvc/felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/MultiplePrototypeRefPair.java?rev=1851460&r1=1851459&r2=1851460&view=diff
==============================================================================
---
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/MultiplePrototypeRefPair.java
(original)
+++
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/MultiplePrototypeRefPair.java
Wed Jan 16 15:51:23 2019
@@ -35,7 +35,7 @@ import org.osgi.service.log.LogService;
*/
public class MultiplePrototypeRefPair<S, T> extends RefPair<S, T>
{
- private final ConcurrentMap<ComponentContextImpl<S>, T> instances = new
ConcurrentHashMap<>();
+ private final ConcurrentMap<ComponentContextImpl<S>, T> instances = new
ConcurrentHashMap<ComponentContextImpl<S>, T>();
public MultiplePrototypeRefPair( ServiceReference<T> ref )
{
