Skip to content
This repository has been archived by the owner on Feb 8, 2019. It is now read-only.

Workaround WAVE-446 #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
import org.waveprotocol.wave.model.version.HashedVersion;
import org.waveprotocol.wave.util.logging.Log;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.logging.Level;
Expand Down Expand Up @@ -153,11 +155,28 @@ public synchronized void submitResponse(WaveletName waveletName, HashedVersion v

// Forward any queued deltas.
List<TransformedWaveletDelta> filteredDeltas = filterOwnDeltas(state.heldBackDeltas, state);
if (!filteredDeltas.isEmpty()) {
sendUpdate(waveletName, filteredDeltas, null);
}
splitDeltasAndSendUpdate(waveletName, filteredDeltas);
state.heldBackDeltas.clear();
}

/**
* Sent each delta in a separated message to the client.
* <p><br>
* Workaround for WAVE-446:
* Wave's client fails if a non contiguous list of deltas is sent at once.
* <p>
*
* @param waveletName the wavelet's name
* @param deltas list of deltas to be forwarded
*/
protected void splitDeltasAndSendUpdate(WaveletName waveletName, List<TransformedWaveletDelta> deltas) {
if (!deltas.isEmpty()) {
for (TransformedWaveletDelta delta : deltas) {
List<TransformedWaveletDelta> singletonDeltaList = Collections.singletonList(delta);
sendUpdate(waveletName, singletonDeltaList, null);
}
}
}

/**
* Sends deltas for this subscription (if appropriate).
Expand Down