Fix #36

fhoeben · Dec 29, 2015 · 9b16ddc · 9b16ddc
1 parent ccb1d82
commit 9b16ddc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/nl/hsac/fitnesse/fixture/util/NamespaceContextImpl.java b/src/main/java/nl/hsac/fitnesse/fixture/util/NamespaceContextImpl.java
@@ -34,7 +34,9 @@ public void add(String prefix, String uri) {
                 }
             }
         } else {
-            namespaces.put(prefix, uri);
+            if (uri != null) {
+                namespaces.put(prefix, uri);
+            }
         }
     }
 

diff --git a/src/test/java/nl/hsac/fitnesse/fixture/util/NamespaceContextImplTest.java b/src/test/java/nl/hsac/fitnesse/fixture/util/NamespaceContextImplTest.java
@@ -93,4 +93,16 @@ public void addDuplicatePrefixNullUri() {
 
         assertNull(impl.getNamespaceURI(prefix));
     }
+
+    @Test
+    public void addDuplicatePrefixNullUriFirst() {
+        String prefix = "p2";
+        String uri = "aadsad2";
+
+        impl.add(prefix, null);
+        assertNull(impl.getNamespaceURI(prefix));
+
+        impl.add(prefix, uri);
+        assertEquals(uri, impl.getNamespaceURI(prefix));
+    }
 }