@@ -121,8 +121,7 @@ Future<DataSnapshot> Query::GetValueLastResult() {
121121}
122122
123123void Query::AddValueListener (ValueListener* listener) {
124- FIREBASE_ASSERT_RETURN_VOID (listener != nullptr );
125- if (internal_) internal_->AddValueListener (listener);
124+ if (internal_ && listener) internal_->AddValueListener (listener);
126125}
127126
128127void Query::RemoveValueListener (ValueListener* listener) {
@@ -136,8 +135,7 @@ void Query::RemoveAllValueListeners() {
136135}
137136
138137void Query::AddChildListener (ChildListener* listener) {
139- FIREBASE_ASSERT_RETURN_VOID (listener != nullptr );
140- if (internal_) internal_->AddChildListener (listener);
138+ if (internal_ && listener) internal_->AddChildListener (listener);
141139}
142140
143141void Query::RemoveChildListener (ChildListener* listener) {
@@ -160,8 +158,8 @@ void Query::SetKeepSynchronized(bool keep_sync) {
160158}
161159
162160Query Query::OrderByChild (const char * path) {
163- FIREBASE_ASSERT_RETURN ( Query (), path != nullptr );
164- return internal_ ? Query (internal_-> OrderByChild (path)) : Query (nullptr );
161+ return internal_ && path ? Query (internal_-> OrderByChild (path))
162+ : Query (nullptr );
165163}
166164
167165Query Query::OrderByChild (const std::string& path) {
@@ -185,29 +183,29 @@ Query Query::StartAt(Variant order_value) {
185183}
186184
187185Query Query::StartAt (Variant order_value, const char * child_key) {
188- FIREBASE_ASSERT_RETURN ( Query (), child_key != nullptr );
189- return internal_ ? Query (internal_->StartAt (order_value, child_key))
190- : Query (nullptr );
186+ return internal_ && child_key
187+ ? Query (internal_->StartAt (order_value, child_key))
188+ : Query (nullptr );
191189}
192190
193191Query Query::EndAt (Variant order_value) {
194192 return internal_ ? Query (internal_->EndAt (order_value)) : Query (nullptr );
195193}
196194
197195Query Query::EndAt (Variant order_value, const char * child_key) {
198- FIREBASE_ASSERT_RETURN ( Query (), child_key != nullptr );
199- return internal_ ? Query (internal_->EndAt (order_value, child_key))
200- : Query (nullptr );
196+ return internal_ && child_key
197+ ? Query (internal_->EndAt (order_value, child_key))
198+ : Query (nullptr );
201199}
202200
203201Query Query::EqualTo (Variant order_value) {
204202 return internal_ ? Query (internal_->EqualTo (order_value)) : Query (nullptr );
205203}
206204
207205Query Query::EqualTo (Variant order_value, const char * child_key) {
208- FIREBASE_ASSERT_RETURN ( Query (), child_key != nullptr );
209- return internal_ ? Query (internal_->EqualTo (order_value, child_key))
210- : Query (nullptr );
206+ return internal_ && child_key
207+ ? Query (internal_->EqualTo (order_value, child_key))
208+ : Query (nullptr );
211209}
212210
213211Query Query::LimitToFirst (size_t limit) {
0 commit comments