svn commit: r1559329 - in /felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo: HandlerManagerFactory.java IPojoFactory.java

[cl...@apache.org]

Author: clement
Date: Sat Jan 18 08:44:56 2014
New Revision: 1559329

URL: http://svn.apache.org/r1559329
Log:
Fix FELIX-4386

Invalid synchronization of the component type description. The value is immutable.

Modified:
    felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java
    felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java?rev=1559329&r1=1559328&r2=1559329&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java Sat Jan 18 08:44:56 2014
@@ -110,7 +110,7 @@ public class HandlerManagerFactory exten
     }
 
     public String getFactoryName() {
-        if (m_type != null  && "composite".equals(m_type)  && IPOJO_NAMESPACE.equals(m_namespace)) {
+        if ("composite".equals(m_type) && IPOJO_NAMESPACE.equals(m_namespace)) {
             // Artificially change the factory name, to avoid name clash when we generate the instance name.
             return m_namespace + ".composite:" + getName();
         }

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java?rev=1559329&r1=1559328&r2=1559329&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java Sat Jan 18 08:44:56 2014
@@ -367,7 +367,7 @@ public abstract class IPojoFactory imple
      * Gets the component type description.
      * @return the component type description object. <code>Null</code> if not already computed.
      */
-    public synchronized ComponentTypeDescription getComponentDescription() {
+    public ComponentTypeDescription getComponentDescription() {
         return m_componentDesc;
     }
 
@@ -376,7 +376,7 @@ public abstract class IPojoFactory imple
      * @return the component type description.
      * @see org.apache.felix.ipojo.Factory#getDescription()
      */
-    public synchronized Element getDescription() {
+    public Element getDescription() {
         // Can be null, if not already computed.
         if (m_componentDesc == null) {
             return new Element("No description available for " + m_factoryName, "");