You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/03/28 17:59:06 UTC
karaf git commit: KARAF-4335 - Avoid NPE in ClientMojo
Repository: karaf
Updated Branches:
refs/heads/master a2735d5a5 -> 8570683db
KARAF-4335 - Avoid NPE in ClientMojo
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8570683d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8570683d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8570683d
Branch: refs/heads/master
Commit: 8570683db82d3f58836b2283228124d2e6c2abc7
Parents: a2735d5
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Mar 28 17:57:31 2016 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Mar 28 17:57:31 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/tooling/client/ClientMojo.java | 25 ++++++++++----------
1 file changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8570683d/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
index f6373d2..930be6c 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
@@ -92,23 +92,24 @@ public class ClientMojo extends AbstractMojo {
public void execute() throws MojoExecutionException {
// Add commands from scripts to already declared commands
- for (File script : scripts) {
- try (BufferedReader br = new BufferedReader(new FileReader(script))) {
- String line;
- while ((line = br.readLine()) != null) {
- line = line.trim();
- if (line.isEmpty()) {
- continue;
+ if (scripts != null) {
+ for (File script : scripts) {
+ try (BufferedReader br = new BufferedReader(new FileReader(script))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ line = line.trim();
+ if (line.isEmpty()) {
+ continue;
+ }
+ commands.add(line);
}
- commands.add(line);
+ } catch (Exception e) {
+ throw new MojoExecutionException(e, e.getMessage(), e.toString());
}
}
- catch (Exception e) {
- throw new MojoExecutionException(e, e.getMessage(), e.toString());
- }
}
- if (commands.isEmpty()) {
+ if (commands == null || commands.isEmpty()) {
getLog().warn("No OSGi command was specified");
return;
}