Merge pull request #413 from sco0ter/nodeNPE

Fix NPE in Node.java when changing node configuration.

Merge pull request #413 from sco0ter/nodeNPE
Fix NPE in Node.java when changing node configuration.
16f319fe · Dave Cridland · 2bb8ec26 · 2cfee0c6 · 16f319fe
Commit 16f319fe authored Dec 01, 2015 by Dave Cridland
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Node.java src/java/org/jivesoftware/openfire/pubsub/Node.java +1 -1

No files found.
--- a/src/java/org/jivesoftware/openfire/pubsub/Node.java
+++ b/src/java/org/jivesoftware/openfire/pubsub/Node.java
@@ -875,7 +875,7 @@ public abstract class Node {
            formField.setLabel(LocaleUtils.getLocalizedString("pubsub.form.conf.collection"));
        }

-        if (!parent.isRootCollectionNode()) {
+        if (parent != null && !parent.isRootCollectionNode()) {
        	formField.addValue(parent.getNodeID());
        }