You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/07/11 15:45:47 UTC
svn commit: r1690370 - in
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl:
config/ConfigurableComponentHolder.java helper/FieldHandler.java
Author: cziegeler
Date: Sat Jul 11 13:45:46 2015
New Revision: 1690370
URL: http://svn.apache.org/r1690370
Log:
[DS][RFC-212] Various issues with field references
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java?rev=1690370&r1=1690369&r2=1690370&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java Sat Jul 11 13:45:46 2015
@@ -91,7 +91,7 @@ public class ConfigurableComponentHolder
* the index in metadata.getConfigurationPid() of the base factory pid, if any. Each component created from a factory configuration
* might have a different targeted pid.
*/
- private Integer m_factoryPidIndex;
+ private volatile Integer m_factoryPidIndex;
/**
* the non-factory configurations shared between all instances.
@@ -132,7 +132,7 @@ public class ConfigurableComponentHolder
* by this field is also contained in the map</li>
* <ul>
*/
- private AbstractComponentManager<S> m_singleComponent;
+ private volatile AbstractComponentManager<S> m_singleComponent;
/**
* Whether components have already been enabled by calling the
@@ -143,8 +143,8 @@ public class ConfigurableComponentHolder
*/
private volatile boolean m_enabled;
private final Object enableLock = new Object();
- private Promise<Void> m_enablePromise;
- private Promise<Void> m_disablePromise = Promises.resolved(null);
+ private volatile Promise<Void> m_enablePromise;
+ private volatile Promise<Void> m_disablePromise = Promises.resolved(null);
private final ComponentMethods m_componentMethods;
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java?rev=1690370&r1=1690369&r2=1690370&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java Sat Jul 11 13:45:46 2015
@@ -50,7 +50,8 @@ public class FieldHandler
serviceObjects,
serviceType,
map,
- tuple
+ tuple,
+ ignore
}
/** The reference metadata. */
@@ -304,27 +305,44 @@ public class FieldHandler
return null;
}
- // if the field is dynamic and optional it has to be volatile
- if ( !metadata.isStatic() && metadata.isOptional() )
- {
- if ( !Modifier.isVolatile(f.getModifiers()) )
- {
- logger.log( LogService.LOG_ERROR, "Field {0} in component {1} must be declared volatile to handle a dynamic reference", new Object[]
- {metadata.getField(), this.componentClass}, null );
- return null;
- }
+ // if the field is dynamic, it has to be volatile (field is ignored, case logged) (112.3.8.1)
+ if ( !metadata.isStatic() && !Modifier.isVolatile(f.getModifiers()) ) {
+ logger.log( LogService.LOG_ERROR, "Field {0} in component {1} must be declared volatile to handle a dynamic reference", new Object[]
+ {metadata.getField(), this.componentClass}, null );
+ valueType = ParamType.ignore;
}
- // the field must not be final
+ // the field must not be final (field is ignored, case logged) (112.3.8.1)
if ( Modifier.isFinal(f.getModifiers()) )
{
logger.log( LogService.LOG_ERROR, "Field {0} in component {1} must not be declared as final", new Object[]
{metadata.getField(), this.componentClass}, null );
- return null;
+ valueType = ParamType.ignore;
}
}
else
{
+ if ( ReferenceMetadata.FIELD_VALUE_TYPE_SERVICE.equals(metadata.getFieldCollectionType()) )
+ {
+ valueType = ParamType.serviceType;
+ }
+ else if ( ReferenceMetadata.FIELD_VALUE_TYPE_REFERENCE.equals(metadata.getFieldCollectionType()) )
+ {
+ valueType = ParamType.serviceReference;
+ }
+ else if ( ReferenceMetadata.FIELD_VALUE_TYPE_SERVICEOBJECTS.equals(metadata.getFieldCollectionType()) )
+ {
+ valueType = ParamType.serviceObjects;
+ }
+ else if ( ReferenceMetadata.FIELD_VALUE_TYPE_PROPERTIES.equals(metadata.getFieldCollectionType()) )
+ {
+ valueType = ParamType.map;
+ }
+ else if ( ReferenceMetadata.FIELD_VALUE_TYPE_TUPLE.equals(metadata.getFieldCollectionType()) )
+ {
+ valueType = ParamType.tuple;
+ }
+
// multiple cardinality, field type must be collection or subtype
if ( !ClassUtils.COLLECTION_CLASS.isAssignableFrom(fieldType) )
{
@@ -333,27 +351,21 @@ public class FieldHandler
return null;
}
- // if the field is dynamic with the replace strategy it has to be volatile
+ // if the field is dynamic with the replace strategy it has to be volatile (field is ignored, case logged) (112.3.8.1)
if ( !metadata.isStatic() && metadata.isReplace() )
{
if ( !Modifier.isVolatile(f.getModifiers()) )
{
logger.log( LogService.LOG_ERROR, "Field {0} in component {1} must be declared volatile to handle a dynamic reference", new Object[]
{metadata.getField(), this.componentClass}, null );
- return null;
+ valueType = ParamType.ignore;
}
}
- // replace strategy: field must not be final
+ // replace strategy: field must not be final (field is ignored, case logged) (112.3.8.1)
// only collection and list allowed
if ( metadata.isReplace() )
{
- if ( Modifier.isFinal(f.getModifiers()) )
- {
- logger.log( LogService.LOG_ERROR, "Field {0} in component {1} must not be declared as final", new Object[]
- {metadata.getField(), this.componentClass}, null );
- return null;
- }
if ( fieldType != ClassUtils.LIST_CLASS && fieldType != ClassUtils.COLLECTION_CLASS )
{
logger.log( LogService.LOG_ERROR, "Field {0} in component {1} has unsupported type {2}."+
@@ -362,27 +374,12 @@ public class FieldHandler
return null;
}
- }
-
- if ( ReferenceMetadata.FIELD_VALUE_TYPE_SERVICE.equals(metadata.getFieldCollectionType()) )
- {
- valueType = ParamType.serviceType;
- }
- else if ( ReferenceMetadata.FIELD_VALUE_TYPE_REFERENCE.equals(metadata.getFieldCollectionType()) )
- {
- valueType = ParamType.serviceReference;
- }
- else if ( ReferenceMetadata.FIELD_VALUE_TYPE_SERVICEOBJECTS.equals(metadata.getFieldCollectionType()) )
- {
- valueType = ParamType.serviceObjects;
- }
- else if ( ReferenceMetadata.FIELD_VALUE_TYPE_PROPERTIES.equals(metadata.getFieldCollectionType()) )
- {
- valueType = ParamType.map;
- }
- else if ( ReferenceMetadata.FIELD_VALUE_TYPE_TUPLE.equals(metadata.getFieldCollectionType()) )
- {
- valueType = ParamType.tuple;
+ if ( Modifier.isFinal(f.getModifiers()) )
+ {
+ logger.log( LogService.LOG_ERROR, "Field {0} in component {1} must not be declared as final", new Object[]
+ {metadata.getField(), this.componentClass}, null );
+ valueType = ParamType.ignore;
+ }
}
}
return f;
@@ -452,7 +449,7 @@ public class FieldHandler
{
case serviceType : obj = refPair.getServiceObject(key); break;
case serviceReference : obj = refPair.getRef(); break;
- case serviceObjects : obj = ((ComponentServiceObjectsHelper)key.getComponentServiceObjectsHelper()).getServiceObjects(refPair.getRef()); break;
+ case serviceObjects : obj = key.getComponentServiceObjectsHelper().getServiceObjects(refPair.getRef()); break;
case map : obj = new ReadOnlyDictionary<String, Object>( refPair.getRef() ); break;
case tuple : final Object tupleKey = new ReadOnlyDictionary<String, Object>( refPair.getRef() );
final Object tupleValue = refPair.getServiceObject(key);
@@ -889,6 +886,11 @@ public class FieldHandler
final MethodResult methodCallFailureResult,
final SimpleLogger logger)
{
+ if ( handler.valueType == ParamType.ignore )
+ {
+ return MethodResult.VOID;
+ }
+
try
{
return handler.state.invoke( handler,
@@ -923,8 +925,8 @@ public class FieldHandler
}
return true;
}
-
}
+
public ReferenceMethod getBind()
{
return new ReferenceMethodImpl(METHOD_TYPE.BIND, this);
@@ -942,6 +944,10 @@ public class FieldHandler
public InitReferenceMethod getInit()
{
+ if ( valueType == ParamType.ignore )
+ {
+ return null;
+ }
return new InitReferenceMethod()
{