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 <[email protected]> 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 <[email protected]> Authored: Thu Apr 23 15:49:33 2015 +0100 Committer: Mark Payne <[email protected]> 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 {
