svn commit: r708251 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry5/dom/Element.java test/resources/org/apache/tapestry5/dom/namespace_element_without_a_prefix.txt

[hlship]

Author: hlship
Date: Mon Oct 27 10:58:43 2008
New Revision: 708251

URL: http://svn.apache.org/viewvc?rev=708251&view=rev
Log:
TAP5-290: Namespace error when partial-updating a zone with a block

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
    
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/namespace_element_without_a_prefix.txt

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java?rev=708251&r1=708250&r2=708251&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
 Mon Oct 27 10:58:43 2008
@@ -508,7 +508,8 @@
         Defense.notNull(namespace, "namespace");
         Defense.notNull(namespacePrefix, "namespacePrefix");
 
-        if (namespaceToPrefix == null) namespaceToPrefix = 
CollectionFactory.newMap();
+        if (namespaceToPrefix == null)
+            namespaceToPrefix = CollectionFactory.newMap();
 
         namespaceToPrefix.put(namespace, namespacePrefix);
 
@@ -581,7 +582,17 @@
 
         // Add a mapping for the element's namespace.
 
-        addMappingIfNeeded(result, namespace);
+        if (InternalUtils.isNonBlank(namespace))
+        {
+
+            // Add the namespace for the element as the default namespace.
+
+            if (!result.containsKey(namespace))
+            {
+                defineNamespace(namespace, "");
+                result.put(namespace, "");
+            }
+        }
 
         // And for any attributes that have a namespace.
 

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/namespace_element_without_a_prefix.txt
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/namespace_element_without_a_prefix.txt?rev=708251&r1=708250&r2=708251&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/namespace_element_without_a_prefix.txt
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/dom/namespace_element_without_a_prefix.txt
 Mon Oct 27 10:58:43 2008
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<ns0:root xmlns:ns0="fredns"><child><ns1:barney betty:betty="b" simple="a" 
ns2:wilma="c" xmlns:ns1="barneyns" xmlns:betty="bettyns" 
xmlns:ns2="wilmans"/></child></ns0:root>
\ No newline at end of file
+<root xmlns="fredns"><child><barney betty:betty="b" simple="a" ns0:wilma="c" 
xmlns="barneyns" xmlns:betty="bettyns" xmlns:ns0="wilmans"/></child></root>
\ No newline at end of file