fix issue 58: JavaBeanDumper.dump throws NullPointerException on list property with null element
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fa40cdf..67e19e1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -7,7 +7,11 @@
</properties>
<body>
<release version="1.7" date="in Mercurial" description="development">
- <action dev="py4fun" type="fix" issue="56" due-to="DZeiss">
+ <action dev="py4fun" type="fix" issue="58" due-to="jeff.caulfield">
+ JavaBeanDumper.dump throws NullPointerException on list property
+ with null element (2010-03-23)
+ </action>
+ <action dev="py4fun" type="fix" issue="56" due-to="DZeiss">
Make constructors in SafeConstructor public (2010-03-16)
</action>
<action dev="obastard" type="fix" issue="53" due-to="obastard">
diff --git a/src/main/java/org/yaml/snakeyaml/representer/Representer.java b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
index 6147838..689eb11 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/Representer.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
@@ -187,7 +187,8 @@
Iterator<Object> iter = memberList.iterator();
for (Node childNode : snode.getValue()) {
Object member = iter.next();
- if (t.equals(member.getClass()) && childNode.getNodeId() == NodeId.mapping) {
+ if (member != null && t.equals(member.getClass())
+ && childNode.getNodeId() == NodeId.mapping) {
childNode.setTag(Tag.MAP);
}
}
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue58/NullValueDumperTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue58/NullValueDumperTest.java
new file mode 100644
index 0000000..f3af1c0
--- /dev/null
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue58/NullValueDumperTest.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2008-2010 Andrey Somov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.yaml.snakeyaml.issues.issue58;
+
+import java.util.ArrayList;
+
+import junit.framework.TestCase;
+
+import org.yaml.snakeyaml.JavaBeanDumper;
+import org.yaml.snakeyaml.Yaml;
+
+public class NullValueDumperTest extends TestCase {
+
+ public static class Foo {
+ private ArrayList<Object> bar = new ArrayList<Object>();
+
+ public ArrayList<Object> getBar() {
+ return bar;
+ }
+
+ public void setBar(ArrayList<Object> bar) {
+ this.bar = bar;
+ }
+ }
+
+ public void testListElement() {
+ final Foo foo = new Foo();
+ foo.bar.add(1);
+ foo.bar.add("A");
+ foo.bar.add(3.14);
+
+ assertEquals("bar:\n- 1\n- A\n- 3.14\n", new JavaBeanDumper().dump(foo));
+ }
+
+ public void testNullListElement() {
+ final Foo foo = new Foo();
+
+ foo.bar.add(1);
+ foo.bar.add("A");
+ foo.bar.add(null);
+ foo.bar.add(3.14);
+ assertEquals("bar:\n- 1\n- A\n- null\n- 3.14\n", new JavaBeanDumper().dump(foo));
+ assertEquals(
+ "!!org.yaml.snakeyaml.issues.issue58.NullValueDumperTest$Foo\nbar: [1, A, null, 3.14]\n",
+ new Yaml().dump(foo));
+ }
+}
