Skip to content
This repository has been archived by the owner on Nov 8, 2021. It is now read-only.

Commit

Permalink
Merge pull request #65 from realm/jp-merge-master
Browse files Browse the repository at this point in the history
Merge public master into cocoa-sync
  • Loading branch information
jpsim committed Sep 26, 2016
2 parents c8023ad + 236e3ac commit 355904f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/impl/transact_log_handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ class TransactLogObserver : public TransactLogValidationMixin, public MarkDirtyM

auto end = m_observers.end();
auto from_it = lower_bound(begin(m_observers), end, ObserverState{current_table(), from, nullptr});
if (from_it == end || *from_it < ObserverState{current_table(), from, nullptr})
if (from_it == end || from_it->table_ndx != current_table() || from_it->row_ndx != from)
return true;

auto to_it = lower_bound(begin(m_observers), end, ObserverState{current_table(), to, nullptr});
Expand Down
1 change: 1 addition & 0 deletions src/shared_realm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ void Realm::add_schema_change_handler()
auto required_changes = m_schema.compare(new_schema);
ObjectStore::verify_valid_additive_changes(required_changes);
m_schema.copy_table_columns_from(new_schema);
m_coordinator->update_schema(m_schema, m_schema_version);
});
}
}
Expand Down

0 comments on commit 355904f

Please sign in to comment.