Repository: nifi Updated Branches: refs/heads/0.x f571379fe -> f0c9fa631
NIFI-2046 - Adding reference to @TriggerSerially in Processor javadoc This closes #549 Signed-off-by: jpercivall <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f0c9fa63 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f0c9fa63 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f0c9fa63 Branch: refs/heads/0.x Commit: f0c9fa63155ea65291f8c9f975b8996dadc9d53e Parents: f571379 Author: Bryan Rosander <[email protected]> Authored: Mon Jun 20 14:22:02 2016 -0400 Committer: jpercivall <[email protected]> Committed: Tue Jun 21 17:29:14 2016 -0400 ---------------------------------------------------------------------- nifi-api/src/main/java/org/apache/nifi/processor/Processor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f0c9fa63/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java b/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java index 53c7c70..98efc68 100644 --- a/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java +++ b/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java @@ -67,8 +67,9 @@ public interface Processor extends ConfigurableComponent { /** * <p> * The method called when this processor is triggered to operate by the - * controller. This method may be called concurrently from different - * threads. When this method is called depends on how this processor is + * controller. In the absence of the {@link org.apache.nifi.annotation.behavior.TriggerSerially} annotation, + * this method may be called concurrently from different threads. + * When this method is called depends on how this processor is * configured within a controller to be triggered (timing or event * based).</p> *
