Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-843: Ensure that a new HashMap is used when populating the propertyMap member variable for thread safety

This commit is contained in:
Mark Payne 2015-08-12 10:09:02 -04:00
parent 5962404379
commit e9c2535df7
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
View File

@ -34,7 +34,6 @@ import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
@ -106,8 +105,7 @@ public class RouteOnAttribute extends AbstractProcessor {
private volatile Set<String> dynamicPropertyNames = new HashSet<>();
/**
* Cache of dynamic properties set during {@link #onScheduled(ProcessContext)} and
* cleared during {@link #onStopped(ProcessContext)} for quick access in
* Cache of dynamic properties set during {@link #onScheduled(ProcessContext)} for quick access in
* {@link #onTrigger(ProcessContext, ProcessSession)}
*/
private volatile Map<Relationship, PropertyValue> propertyMap = new HashMap<>();
@ -182,20 +180,18 @@ public class RouteOnAttribute extends AbstractProcessor {
*/
@OnScheduled
public void onScheduled(final ProcessContext context) {
final Map<Relationship, PropertyValue> newPropertyMap = new HashMap<>();
for (final PropertyDescriptor descriptor : context.getProperties().keySet()) {
if (!descriptor.isDynamic()) {
continue;
}
getLogger().debug("Adding new dynamic property: {}", new Object[]{descriptor});
propertyMap.put(new Relationship.Builder().name(descriptor.getName()).build(), context.getProperty(descriptor));
newPropertyMap.put(new Relationship.Builder().name(descriptor.getName()).build(), context.getProperty(descriptor));
}
this.propertyMap = newPropertyMap;
}
@OnStopped
public void onStopped() {
getLogger().debug("Clearing propertyMap");
propertyMap.clear();
}
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) {
@ -206,8 +202,9 @@ public class RouteOnAttribute extends AbstractProcessor {
final ProcessorLog logger = getLogger();
final Map<Relationship, PropertyValue> propMap = this.propertyMap;
final Set<Relationship> matchingRelationships = new HashSet<>();
for (final Map.Entry<Relationship, PropertyValue> entry : propertyMap.entrySet()) {
for (final Map.Entry<Relationship, PropertyValue> entry : propMap.entrySet()) {
final PropertyValue value = entry.getValue();
final boolean matches = value.evaluateAttributeExpressions(flowFile).asBoolean();
@ -219,7 +216,7 @@ public class RouteOnAttribute extends AbstractProcessor {
final Set<Relationship> destinationRelationships = new HashSet<>();
switch (context.getProperty(ROUTE_STRATEGY).getValue()) {
case routeAllMatchValue:
if (matchingRelationships.size() == propertyMap.size()) {
if (matchingRelationships.size() == propMap.size()) {
destinationRelationships.add(REL_MATCH);
} else {
destinationRelationships.add(REL_NO_MATCH);