another fix for refresh and report errors

[perl-cwmp.git] / lib / CWMP / Vendor.pm

diff --git a/lib/CWMP/Vendor.pm b/lib/CWMP/Vendor.pm
index 438c321..9613528 100644 (file)
--- a/lib/CWMP/Vendor.pm
+++ b/lib/CWMP/Vendor.pm
@@ -83,13 +83,17 @@ sub vendor_config {
                if ( ! exists $stored->{$n} ) {
                        warn "# $uid missing $n\n";
                        push @refresh, $n;
-               } elsif ( $vendor->{$n} ne $stored->{$n} && ! $tried->{$uid}->{$n}->{set} && $tried->{$uid}->{$n}->{set} ne $vendor->{$n} ) {
+               } elsif ( $vendor->{$n} ne $stored->{$n}
+                       && ( ! $tried->{$uid}->{$n}->{set} || $tried->{$uid}->{$n}->{set} ne $vendor->{$n} )
+               ) {
                        $queue->enqueue( 'SetParameterValues', { $n => $vendor->{$n} } );
                        push @refresh, $n;
                        $tried->{$uid}->{$n}->{set} = $vendor->{$n};
                        warn "# set $uid $n $stored->{$n} -> $vendor->{$n}\n";
+               } elsif ( $tried->{$uid}->{$n}->{set} eq $vendor->{$n} && $vendor->{$n} ne $stored->{$n} ) {
+                       warn "ERROR $uid $n $stored->{$n} != $vendor->{$n}\n";
                } else {
-                       warn "# ok $uid $n\n";
+                       warn "# ok $uid $n = $stored->{$n}\n";
                }
        }