[Bps-public-commit] Prophet - A disconnected, replicated p2p database branch, master, updated. 3834533d5e24c8eeae8baa66436c6a6f38953f8b

[jesse]

The branch, master has been updated
       via  3834533d5e24c8eeae8baa66436c6a6f38953f8b (commit)
      from  30be47aae2fb7f28a26246059363568269ccb799 (commit)

Summary of changes:
 lib/Prophet/Replica.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 3834533d5e24c8eeae8baa66436c6a6f38953f8b
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Jan 26 14:17:53 2009 -0500

    Actually run the callback when we search for changesets, even if the target already has it

diff --git a/lib/Prophet/Replica.pm b/lib/Prophet/Replica.pm
index ef18b77..5bc288a 100644
--- a/lib/Prophet/Replica.pm
+++ b/lib/Prophet/Replica.pm
@@ -263,7 +263,7 @@ sub integrate_changeset {
     # we'll want to skip or remove those changesets
 
 
-    if (   $changeset->is_nullification || !$changeset->has_changes ) {
+    if (   $changeset->is_resolution || $changeset->is_nullification || !$changeset->has_changes ) {
         # if it's a changeset we don't care about, mark it as seen and move on
         $self->record_integration_of_changeset($changeset);
         return;
@@ -455,7 +455,7 @@ sub traverse_new_changesets {
     $self->traverse_changesets(
         after    => $args{for}->last_changeset_from_source( $self->uuid ),
         callback => sub {
-            $args{callback}->( $_[0] )   if $self->should_send_changeset( changeset => $_[0], to => $args{for});
+            $args{callback}->( $_[0] ) ;#  if $self->should_send_changeset( changeset => $_[0], to => $args{for});
         }
     );
 }

-----------------------------------------------------------------------