You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/04/10 18:45:41 UTC
[1/4] git commit: KARAF-2899 - NPE when running features:listUrl
Repository: karaf
Updated Branches:
refs/heads/karaf-2.3.x 0c4370f4f -> c6cb968c2
refs/heads/karaf-2.x f85b11f5e -> fdababb92
refs/heads/karaf-3.0.x 21ee54c56 -> 1dcfe2752
refs/heads/master 48ef3aa01 -> 4b6b7afb1
KARAF-2899 - NPE when running features:listUrl
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fdababb9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fdababb9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fdababb9
Branch: refs/heads/karaf-2.x
Commit: fdababb923d7f3747dac9015f58080bf20fcc44e
Parents: f85b11f
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Apr 10 13:58:25 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Apr 10 13:58:25 2014 -0230
----------------------------------------------------------------------
.../karaf/features/command/ListUrlCommand.java | 28 +++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fdababb9/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
----------------------------------------------------------------------
diff --git a/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
index 206a849..26d51f5 100644
--- a/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
+++ b/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
@@ -52,23 +52,25 @@ public class ListUrlCommand extends FeaturesCommandSupport {
if ((repos != null) && (repos.length > 0)) {
for (int i = 0; i < repos.length; i++) {
- URI uri = repos[i].getURI();
+ if (repos[i] != null) {
+ URI uri = repos[i].getURI();
- String line = "";
- line += repos[i].isValid() ? " true " : " false";
+ String line = "";
+ line += repos[i].isValid() ? " true " : " false";
- if (validation) {
- try {
- admin.validateRepository(uri);
- // append valid flag if validation mode is tuned on
- line += " true ";
- } catch (Exception e) {
- line += " false ";
- verboseOutput += uri + ":" + e.getMessage() + "\n";
+ if (validation) {
+ try {
+ admin.validateRepository(uri);
+ // append valid flag if validation mode is tuned on
+ line += " true ";
+ } catch (Exception e) {
+ line += " false ";
+ verboseOutput += uri + ":" + e.getMessage() + "\n";
+ }
}
- }
- System.out.println(line + " " + uri);
+ System.out.println(line + " " + uri);
+ }
}
if (verbose) {
[2/4] git commit: KARAF-2899 - NPE when running features:listUrl
Posted by ja...@apache.org.
KARAF-2899 - NPE when running features:listUrl
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c6cb968c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c6cb968c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c6cb968c
Branch: refs/heads/karaf-2.3.x
Commit: c6cb968c27d3c8620ecf59d18cabe7f30cdebfe6
Parents: 0c4370f
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Apr 10 14:05:22 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Apr 10 14:05:22 2014 -0230
----------------------------------------------------------------------
.../karaf/features/command/ListUrlCommand.java | 26 +++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6cb968c/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
----------------------------------------------------------------------
diff --git a/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
index 63c16e2..64e9f61 100644
--- a/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
+++ b/features/command/src/main/java/org/apache/karaf/features/command/ListUrlCommand.java
@@ -52,21 +52,23 @@ public class ListUrlCommand extends FeaturesCommandSupport {
if ((repos != null) && (repos.length > 0)) {
for (int i = 0; i < repos.length; i++) {
- URI uri = repos[i].getURI();
+ if (repos[i] != null) {
+ URI uri = repos[i].getURI();
- String line = "";
- line += repos[i].isValid() ? " true " : " false";
+ String line = "";
+ line += repos[i].isValid() ? " true " : " false";
- try {
- admin.validateRepository(uri);
- // append valid flag if validation mode is tuned on
- line += !validation ? "" : " true ";
- } catch (Exception e) {
- line += !validation ? "" : " false ";
- verboseOutput += uri + ":" + e.getMessage() + "\n";
- }
+ try {
+ admin.validateRepository(uri);
+ // append valid flag if validation mode is tuned on
+ line += !validation ? "" : " true ";
+ } catch (Exception e) {
+ line += !validation ? "" : " false ";
+ verboseOutput += uri + ":" + e.getMessage() + "\n";
+ }
- System.out.println(line + " " + uri);
+ System.out.println(line + " " + uri);
+ }
}
if (verbose) {
[3/4] git commit: KARAF-2899 - NPE when running features:listUrl
Posted by ja...@apache.org.
KARAF-2899 - NPE when running features:listUrl
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1dcfe275
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1dcfe275
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1dcfe275
Branch: refs/heads/karaf-3.0.x
Commit: 1dcfe2752ce35c2f6e0980dd7d4f4eb4e937cc3b
Parents: 21ee54c
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Apr 10 14:15:01 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Apr 10 14:15:01 2014 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/features/command/RepoListCommand.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/1dcfe275/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
----------------------------------------------------------------------
diff --git a/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java b/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
index 0cf4b97..939b490 100644
--- a/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
+++ b/features/command/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
@@ -47,7 +47,9 @@ public class RepoListCommand extends FeaturesCommandSupport {
Repository[] repos = featuresService.listRepositories();
for (Repository repo : repos) {
- table.addRow().addContent(repo.getName(), repo.getURI().toString());
+ if (repo != null) {
+ table.addRow().addContent(repo.getName(), repo.getURI().toString());
+ }
}
table.print(System.out, !noFormat);
}
[4/4] git commit: KARAF-2899 - NPE when running features:listUrl
Posted by ja...@apache.org.
KARAF-2899 - NPE when running features:listUrl
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4b6b7afb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4b6b7afb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4b6b7afb
Branch: refs/heads/master
Commit: 4b6b7afb16aa4699e75bd6b739838c55ac20c20e
Parents: 48ef3aa
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Apr 10 14:15:01 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Apr 10 14:15:24 2014 -0230
----------------------------------------------------------------------
.../java/org/apache/karaf/features/command/RepoListCommand.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/4b6b7afb/features/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
----------------------------------------------------------------------
diff --git a/features/src/main/java/org/apache/karaf/features/command/RepoListCommand.java b/features/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
index 591a1c6..55acf79 100644
--- a/features/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
+++ b/features/src/main/java/org/apache/karaf/features/command/RepoListCommand.java
@@ -49,7 +49,9 @@ public class RepoListCommand extends FeaturesCommandSupport {
Repository[] repos = featuresService.listRepositories();
for (Repository repo : repos) {
- table.addRow().addContent(repo.getName(), repo.getURI().toString());
+ if (repo != null) {
+ table.addRow().addContent(repo.getName(), repo.getURI().toString());
+ }
}
table.print(System.out, !noFormat);
}