Repository: incubator-wave Updated Branches: refs/heads/fulltextsearch efe84c950 -> 263e81a5e (forced update)
Fixes NPE. Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/b5b2ca6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/b5b2ca6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/b5b2ca6b Branch: refs/heads/fulltextsearch Commit: b5b2ca6b486b3bcfc2d15442ac1e33a37051f525 Parents: 94e80ae Author: Yuri Zelikov <[email protected]> Authored: Fri Aug 8 16:41:44 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Wed Aug 20 23:36:10 2014 +0300 ---------------------------------------------------------------------- .../box/server/waveserver/AbstractSearchProviderImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/b5b2ca6b/src/org/waveprotocol/box/server/waveserver/AbstractSearchProviderImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/AbstractSearchProviderImpl.java b/src/org/waveprotocol/box/server/waveserver/AbstractSearchProviderImpl.java index 48e89a2..111a24c 100644 --- a/src/org/waveprotocol/box/server/waveserver/AbstractSearchProviderImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/AbstractSearchProviderImpl.java @@ -102,7 +102,7 @@ public abstract class AbstractSearchProviderImpl implements SearchProvider { public static WaveViewData buildWaveViewData(WaveId waveId, Set<WaveletId> waveletIds, Function<ReadableWaveletData, Boolean> matchesFunction, WaveMap waveMap) { - WaveViewData view = null; // Copy of the wave built up for search hits. + WaveViewData view = WaveViewDataImpl.create(waveId); // Copy of the wave built up for search hits. for (WaveletId waveletId : waveletIds) { WaveletContainer waveletContainer = null; WaveletName waveletname = WaveletName.of(waveId, waveletId); @@ -117,9 +117,6 @@ public abstract class AbstractSearchProviderImpl implements SearchProvider { if ((waveletContainer == null) || !waveletContainer.applyFunction(matchesFunction)) { continue; } - if (view == null) { - view = WaveViewDataImpl.create(waveId); - } // Just keep adding all the relevant wavelets in this wave. view.addWavelet(waveletContainer.copyWaveletData()); } catch (WaveletStateException e) {
