From cae53206eba75c3cec8947ecb462aa597812154f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 17 Mar 2016 16:33:53 +0000
Subject: [PATCH] Fix NPE in opendj-doc-maven-plugin

---
 opendj-sdk/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-sdk/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
index c771d92..363e719 100644
--- a/opendj-sdk/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
+++ b/opendj-sdk/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
@@ -274,8 +274,10 @@
         public int compareTo(MessagePropertyKey k) {
             if (ordinal == k.ordinal) {
                 return description.compareTo(k.description);
-            } else {
+            } else if (ordinal != null && k.ordinal != null) {
                 return ordinal.compareTo(k.ordinal);
+            } else {
+                return 0;
             }
         }
     }

--
Gitblit v1.10.0