Repository: camel Updated Branches: refs/heads/master cc8126985 -> 7b1f7ce13
Fix potential NPE in maven tool Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b1f7ce1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b1f7ce1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b1f7ce1 Branch: refs/heads/master Commit: 7b1f7ce13cebcb651dbeef89efcb31381184bdb6 Parents: cc81269 Author: Claus Ibsen <[email protected]> Authored: Thu Feb 5 16:06:09 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Feb 5 16:06:09 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/maven/packaging/PackageComponentMojo.java | 4 +++- .../apache/camel/maven/packaging/PackageDataFormatMojo.java | 8 ++++++-- .../apache/camel/maven/packaging/PackageLanguageMojo.java | 8 ++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7b1f7ce1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java index 8e90a50..7b8e1f6 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java @@ -115,7 +115,9 @@ public class PackageComponentMojo extends AbstractMojo { properties.put("artifactId", project.getArtifactId()); properties.put("version", project.getVersion()); properties.put("projectName", project.getName()); - properties.put("projectDescription", project.getDescription()); + if (project.getDescription() != null) { + properties.put("projectDescription", project.getDescription()); + } camelMetaDir.mkdirs(); File outFile = new File(camelMetaDir, "component.properties"); http://git-wip-us.apache.org/repos/asf/camel/blob/7b1f7ce1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java index 4be4e3a..90a62d5 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java @@ -223,7 +223,9 @@ public class PackageDataFormatMojo extends AbstractMojo { properties.put("artifactId", project.getArtifactId()); properties.put("version", project.getVersion()); properties.put("projectName", project.getName()); - properties.put("projectDescription", project.getDescription()); + if (project.getDescription() != null) { + properties.put("projectDescription", project.getDescription()); + } camelMetaDir.mkdirs(); File outFile = new File(camelMetaDir, "dataformat.properties"); @@ -289,7 +291,9 @@ public class PackageDataFormatMojo extends AbstractMojo { buffer.append("\n \"name\": \"").append(dataFormatModel.getName()).append("\","); buffer.append("\n \"kind\": \"").append("dataformat").append("\","); buffer.append("\n \"modelName\": \"").append(dataFormatModel.getModelName()).append("\","); - buffer.append("\n \"description\": \"").append(dataFormatModel.getDescription()).append("\","); + if (dataFormatModel.getDescription() != null) { + buffer.append("\n \"description\": \"").append(dataFormatModel.getDescription()).append("\","); + } buffer.append("\n \"label\": \"").append(dataFormatModel.getLabel()).append("\","); buffer.append("\n \"javaType\": \"").append(dataFormatModel.getJavaType()).append("\","); if (dataFormatModel.getModelJavaType() != null) { http://git-wip-us.apache.org/repos/asf/camel/blob/7b1f7ce1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java index 2819641..811169f 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java @@ -223,7 +223,9 @@ public class PackageLanguageMojo extends AbstractMojo { properties.put("artifactId", project.getArtifactId()); properties.put("version", project.getVersion()); properties.put("projectName", project.getName()); - properties.put("projectDescription", project.getDescription()); + if (project.getDescription() != null) { + properties.put("projectDescription", project.getDescription()); + } camelMetaDir.mkdirs(); File outFile = new File(camelMetaDir, "language.properties"); @@ -286,7 +288,9 @@ public class PackageLanguageMojo extends AbstractMojo { buffer.append("\n \"name\": \"").append(languageModel.getName()).append("\","); buffer.append("\n \"kind\": \"").append("language").append("\","); buffer.append("\n \"modelName\": \"").append(languageModel.getModelName()).append("\","); - buffer.append("\n \"description\": \"").append(languageModel.getDescription()).append("\","); + if (languageModel.getDescription() != null) { + buffer.append("\n \"description\": \"").append(languageModel.getDescription()).append("\","); + } buffer.append("\n \"label\": \"").append(languageModel.getLabel()).append("\","); buffer.append("\n \"javaType\": \"").append(languageModel.getJavaType()).append("\","); if (languageModel.getModelJavaType() != null) {
