From 68cb89c0b56099f76bec3afe3012dea1fce5aa0d Mon Sep 17 00:00:00 2001 From: "zur.do@moonactive.com" Date: Sat, 25 Jul 2020 18:09:21 +0300 Subject: [PATCH] revert --- .../hollow/api/producer/AbstractHollowProducer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hollow/src/main/java/com/netflix/hollow/api/producer/AbstractHollowProducer.java b/hollow/src/main/java/com/netflix/hollow/api/producer/AbstractHollowProducer.java index 7d4a22976b..61c9127c49 100644 --- a/hollow/src/main/java/com/netflix/hollow/api/producer/AbstractHollowProducer.java +++ b/hollow/src/main/java/com/netflix/hollow/api/producer/AbstractHollowProducer.java @@ -375,9 +375,9 @@ long runCycle( ReadStateHelper candidate = readStates.roundtrip(toVersion); cycleStatus.readState(candidate.pending()); - candidate = doIntegrityCheck ? + candidate = doIntegrityCheck ? checkIntegrity(listeners, candidate, artifacts, schemaChangedFromPriorVersion) : - noIntegrityCheck(candidate, artifacts); + noIntegrityCheck(candidate, artifacts); try { validate(listeners, candidate.pending()); @@ -728,11 +728,11 @@ private ReadStateHelper checkIntegrity( listeners.fireIntegrityCheckComplete(status); } } - + private ReadStateHelper noIntegrityCheck(ReadStateHelper readStates, Artifacts artifacts) throws IOException { ReadStateHelper result = readStates; - if(!readStates.hasCurrent() || + if(!readStates.hasCurrent() || (!readStates.current().getStateEngine().hasIdenticalSchemas(getWriteEngine()) && artifacts.snapshot != null)) { HollowReadStateEngine pending = readStates.pending().getStateEngine(); readSnapshot(artifacts.snapshot, pending); @@ -745,7 +745,7 @@ private ReadStateHelper noIntegrityCheck(ReadStateHelper readStates, Artifacts a } applyDelta(artifacts.delta, current); - + result = readStates.swap(); } } @@ -796,7 +796,7 @@ private void validate(ProducerListeners listeners, HollowProducer.ReadState read } } - + private void announce(ProducerListeners listeners, HollowProducer.ReadState readState) { if (announcer != null) { Status.StageWithStateBuilder status = listeners.fireAnnouncementStart(readState);