You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2018/10/22 17:12:26 UTC
nifi git commit: NIFI-5736: Removed 'synchronized' keyword from
SwappablePriorityQueue#getProperties - the method should not be synchronized,
as it guards access to member variables via a ReadLock. I am guessing that the
synchronized keyword is the resul
Repository: nifi
Updated Branches:
refs/heads/master 08c54bc48 -> 5561c29ed
NIFI-5736: Removed 'synchronized' keyword from SwappablePriorityQueue#getProperties - the method should not be synchronized, as it guards access to member variables via a ReadLock. I am guessing that the synchronized keyword is the result of refactoring from 'synchronized' to a read lock and inadvertently leaving the 'synchronized' keyword in.
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #3101
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5561c29e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5561c29e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5561c29e
Branch: refs/heads/master
Commit: 5561c29ed3b8c635f499582e983a5147cb06e306
Parents: 08c54bc
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Oct 22 12:08:23 2018 -0400
Committer: Matthew Burgess <ma...@apache.org>
Committed: Mon Oct 22 12:22:05 2018 -0400
----------------------------------------------------------------------
.../org/apache/nifi/controller/queue/SwappablePriorityQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/5561c29e/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
index 6dfa77d..058c714 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
@@ -103,7 +103,7 @@ public class SwappablePriorityQueue {
return flowFileQueue.getIdentifier();
}
- public synchronized List<FlowFilePrioritizer> getPriorities() {
+ public List<FlowFilePrioritizer> getPriorities() {
readLock.lock();
try {
return Collections.unmodifiableList(priorities);