← Back to branch summary

~marcustomlinson/unity-scopes-api/relax-process-timeout

« back to all changes in this revision

Viewing changes to src/scopes/internal/ResultReplyObject.cpp

  • Committer: Marcus Tomlinson
  • Date: 2016-09-08 08:22:37 UTC
  • mfrom: (163.431.71 devel)
  • Revision ID: marcus.tomlinson@canonical.com-20160908082237-rwops3rey78rgddz
Merged devel

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scopes/internal/ResultReplyObject.cpp
74
74
        }
75
75
 
76
76
        Filters const filters = FilterBaseImpl::deserialize_filters(it->second.get_array(), groups);
77
 
        it = data.find("filter_state");
78
 
        if (it != data.end())
79
 
        {
80
 
            auto filter_state = FilterStateImpl::deserialize(it->second.get_dict());
81
 
            receiver_->push(filters, filter_state);
82
 
        }
83
 
        else
84
 
        {
85
 
            throw InvalidArgumentException("ResultReplyObject::push(): filters present but missing filter_state data");
86
 
        }
 
77
 
 
78
        // temporarily support both variants of push until the one supporting filter state gets dropped.
 
79
        FilterState filter_state;
 
80
        receiver_->push(filters, filter_state);
 
81
        receiver_->push(filters);
87
82
    }
88
83
 
89
84
    it = data.find("category");