You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/01/08 10:01:52 UTC
[1/4] karaf git commit: [KARAF-3404] Fix possible NPE
Repository: karaf
Updated Branches:
refs/heads/master ee96f837a -> 0c1218406
[KARAF-3404] Fix possible NPE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0c121840
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0c121840
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0c121840
Branch: refs/heads/master
Commit: 0c1218406bf44d8501aaba531cb4437d474dc843
Parents: db1143e
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jan 8 10:01:08 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jan 8 10:01:46 2015 +0100
----------------------------------------------------------------------
profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/0c121840/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java b/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java
index 1f6b507..7f8d483 100644
--- a/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java
+++ b/profile/src/main/java/org/apache/karaf/profile/impl/Profiles.java
@@ -52,7 +52,8 @@ public final class Profiles {
ProfileBuilder builder;
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
- if (dir.getFileName().toString().endsWith(PROFILE_FOLDER_SUFFIX)) {
+ Path fileName = dir.getFileName();
+ if (fileName != null && fileName.toString().endsWith(PROFILE_FOLDER_SUFFIX)) {
String profileId = root.relativize(dir).toString();
profileId = profileId.replaceAll(root.getFileSystem().getSeparator(), "-");
profileId = profileId.substring(0, profileId.length() - PROFILE_FOLDER_SUFFIX.length());
[2/4] karaf git commit: Fix possible thread safety problem in
completer
Posted by gn...@apache.org.
Fix possible thread safety problem in completer
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/22ece466
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/22ece466
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/22ece466
Branch: refs/heads/master
Commit: 22ece466b8cb1497076659a078729b1e144cb0e0
Parents: 0c97f00
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jan 8 10:00:05 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jan 8 10:01:46 2015 +0100
----------------------------------------------------------------------
.../command/completers/ConfigurationPropertyCompleter.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/22ece466/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java b/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
index 2b43fec..78d88a2 100644
--- a/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
+++ b/config/src/main/java/org/apache/karaf/config/command/completers/ConfigurationPropertyCompleter.java
@@ -47,8 +47,6 @@ import org.osgi.service.cm.ConfigurationAdmin;
@Service
public class ConfigurationPropertyCompleter implements Completer {
- private final StringsCompleter delegate = new StringsCompleter();
-
private static final String OPTION = "-p";
private static final String ALIAS = "--pid";
@@ -57,15 +55,15 @@ public class ConfigurationPropertyCompleter implements Completer {
@SuppressWarnings("rawtypes")
public int complete(final Session session, final CommandLine commandLine, final List<String> candidates) {
+ StringsCompleter strings = new StringsCompleter();
if (session != null) {
String pid = getPid(session, commandLine);
Set<String> propertyNames = getPropertyNames(pid);
- delegate.getStrings().clear();
if (propertyNames != null && !propertyNames.isEmpty()) {
- delegate.getStrings().addAll(propertyNames);
+ strings.getStrings().addAll(propertyNames);
}
}
- return delegate.complete(session, commandLine, candidates);
+ return strings.complete(session, commandLine, candidates);
}
/**
[3/4] karaf git commit: Fix javadoc link
Posted by gn...@apache.org.
Fix javadoc link
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/db1143e8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/db1143e8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/db1143e8
Branch: refs/heads/master
Commit: db1143e8966acd535d039cd2b2dbd61ffe9e2092
Parents: 22ece46
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jan 8 10:00:16 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jan 8 10:01:46 2015 +0100
----------------------------------------------------------------------
.../features/command/completers/AvailableFeatureCompleter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/db1143e8/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableFeatureCompleter.java
----------------------------------------------------------------------
diff --git a/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableFeatureCompleter.java b/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableFeatureCompleter.java
index 5881c84..e0dc87a 100644
--- a/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableFeatureCompleter.java
+++ b/features/command/src/main/java/org/apache/karaf/features/command/completers/AvailableFeatureCompleter.java
@@ -20,7 +20,7 @@ import org.apache.karaf.features.Feature;
import org.apache.karaf.shell.api.action.lifecycle.Service;
/**
- * {@link org.apache.karaf.shell.console.Completer} for features not installed yet.
+ * {@link org.apache.karaf.shell.api.console.Completer} for features not installed yet.
*/
@Service
public class AvailableFeatureCompleter extends FeatureCompleterSupport {
[4/4] karaf git commit: [KARAF-3436] Upgrade to felix fileinstall
3.4.4 [KARAF-3435] Support default/alternate values for variable substitution
[KARAF-3434] Support env:XXX subtitution for environment variables
Posted by gn...@apache.org.
[KARAF-3436] Upgrade to felix fileinstall 3.4.4
[KARAF-3435] Support default/alternate values for variable substitution
[KARAF-3434] Support env:XXX subtitution for environment variables
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0c97f001
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0c97f001
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0c97f001
Branch: refs/heads/master
Commit: 0c97f001365b542422e5e9b9075df867f4aa20d0
Parents: ee96f83
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jan 8 09:58:43 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Jan 8 10:01:46 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/0c97f001/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b483c9b..2daa741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
<equinox.coordinator.version>1.1.0.v20120522-1841</equinox.coordinator.version>
<felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
<felix.configadmin.version>1.8.0</felix.configadmin.version>
- <felix.fileinstall.version>3.4.2</felix.fileinstall.version>
+ <felix.fileinstall.version>3.4.3-SNAPSHOT</felix.fileinstall.version>
<felix.framework.version>4.4.1</felix.framework.version>
<felix.framework.security.version>2.4.0</felix.framework.security.version>
<felix.gogo.version>0.14.0</felix.gogo.version>