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 2015/04/28 15:50:09 UTC
[1/2] incubator-nifi git commit: NIFI-526 move check into try so
writeLock is released
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 6e492b408 -> 62edd7a3a
NIFI-526 move check into try so writeLock is released
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b7d2154f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b7d2154f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b7d2154f
Branch: refs/heads/develop
Commit: b7d2154f7de0e587df35e5e7266233feadf646e0
Parents: 6e492b4
Author: Mark Latimer <ma...@gmail.com>
Authored: Thu Apr 23 15:49:33 2015 +0100
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Apr 28 09:34:19 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/processors/standard/GetHTTP.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b7d2154f/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
index 11e75ed..3cf1758 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
@@ -434,8 +434,8 @@ public class GetHTTP extends AbstractSessionFactoryProcessor {
if (timeToPersist < System.currentTimeMillis()) {
readLock.unlock();
writeLock.lock();
- if (timeToPersist < System.currentTimeMillis()) {
- try {
+ try {
+ if (timeToPersist < System.currentTimeMillis()) {
timeToPersist = System.currentTimeMillis() + PERSISTENCE_INTERVAL_MSEC;
File httpCache = new File(HTTP_CACHE_FILE_PREFIX + getIdentifier());
try (FileOutputStream fos = new FileOutputStream(httpCache)) {
@@ -446,10 +446,11 @@ public class GetHTTP extends AbstractSessionFactoryProcessor {
} catch (IOException e) {
getLogger().error("Failed to persist ETag and LastMod due to " + e, e);
}
- } finally {
- readLock.lock();
- writeLock.unlock();
- }
+ }
+ }
+ finally {
+ readLock.lock();
+ writeLock.unlock();
}
}
} finally {
[2/2] incubator-nifi git commit: NIFI-526: Fixed whitespace error
Posted by ma...@apache.org.
NIFI-526: Fixed whitespace error
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/62edd7a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/62edd7a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/62edd7a3
Branch: refs/heads/develop
Commit: 62edd7a3ab524eb53d3f739e23aabaf5cf2eec2c
Parents: b7d2154
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Apr 28 09:50:01 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Apr 28 09:50:01 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/processors/standard/GetHTTP.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62edd7a3/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
index 3cf1758..a1f57da 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetHTTP.java
@@ -446,7 +446,7 @@ public class GetHTTP extends AbstractSessionFactoryProcessor {
} catch (IOException e) {
getLogger().error("Failed to persist ETag and LastMod due to " + e, e);
}
- }
+ }
}
finally {
readLock.lock();