Repository: incubator-wave Updated Branches: refs/heads/wave-0.4-rc6 900ee85cd -> 7d017eefc (forced update)
Fixes tests Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/45a07689 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/45a07689 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/45a07689 Branch: refs/heads/wave-0.4-rc6 Commit: 45a07689423a32daafa25cd92ecba304f852c38f Parents: 65653a5 Author: Yuri Zelikov <[email protected]> Authored: Thu Aug 28 00:15:29 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Thu Aug 28 00:15:29 2014 +0300 ---------------------------------------------------------------------- .../box/server/waveserver/AbstractSearchProviderImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/45a07689/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 e026a81..4407dd3 100644 --- a/src/org/waveprotocol/box/server/waveserver/AbstractSearchProviderImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/AbstractSearchProviderImpl.java @@ -108,14 +108,14 @@ public abstract class AbstractSearchProviderImpl implements SearchProvider { WaveletContainer waveletContainer = null; WaveletName waveletname = WaveletName.of(waveId, waveletId); - // TODO (Yuri Z.) This loop collects all the wavelets that match the // query, so the view is determined by the query. Instead we should // look at the user's wave view and determine if the view matches the // query. try { waveletContainer = waveMap.getWavelet(waveletname); - if ((waveletContainer == null) || !waveletContainer.applyFunction(matchesFunction)) { + if ((waveletContainer == null) || IdUtil.isUserDataWavelet(waveletId) + || !waveletContainer.applyFunction(matchesFunction)) { continue; } // Just keep adding all the relevant wavelets in this wave.
