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/ca645a72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/ca645a72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/ca645a72 Branch: refs/heads/wave-0.4-rc6 Commit: ca645a72322e4aae33c5aae909c956f814d38640 Parents: 571c306 Author: Yuri Zelikov <[email protected]> Authored: Fri Aug 8 16:41:44 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Wed Aug 27 19:17:55 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/ca645a72/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) {
