Item14237: Fixed some leafState handling issues.

In particular DataHash now enforces leaf status for a node in undefined
state if the node is being assigned with a non-hash value.

Fixed data loss when assigning a hash value to a branch node.

Fixed mistypes.

core/lib/Foswiki/Config/DataHash.pm

@@ -213,7 +213,11 @@ sub STORE {
     # operations too.
     if ( !$node->isLeaf && ref($value) eq 'HASH' && !tied(%$value) ) {
 
-        $this->tieNode($key);
+        # Check if the node value is a tied hash already.
+        my $nVal = $node->value;
+        unless ( defined($nVal) && ref($nVal) eq 'HASH' && tied(%$nVal) ) {
+            $this->tieNode($key);
+        }
 
         my $newHash = $node->value;
 
@@ -227,6 +231,9 @@ sub STORE {
     }
     else {
         $node->value($value);
+
+        # Mark node as leaf if
+        $node->setLeafState(1) if $node->isVague;
     }
 }
 
@@ -339,7 +346,7 @@ sub getKeyObject {
             # here because this is what this method is supposed to do.
             $node = $keyObj->makeNode(
                 key         => $key,
-                nodeProfile => { isLeaf => 0, },
+                nodeProfile => { leafState => 0, },
             );
 
             Foswiki::Exception::Fatal->throw(
@@ -461,7 +468,7 @@ sub tieNode {
     $node->value( \%newHash );
 
     # Tieing of a node makes it non-leaf implcitly.
-    $node->isLeaf(0);
+    $node->leafState(0);
 
     return $node;
 }

core/lib/Foswiki/Config/Node.pm

@@ -459,10 +459,10 @@ sub prepareLeafState {
     my $this = shift;
 
     foreach my $opt ( keys %{ $this->options } ) {
-        return 1 if $this->_leafOnlyOpts->{$opt};
+        return LEAF if $this->_leafOnlyOpts->{$opt};
     }
 
-    return NOSTATE;
+    return undef;
 }
 
 =begin TML