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 2017/02/10 08:29:17 UTC
[5/5] karaf git commit: [KARAF-4275] StaticConfigurationAdmin and NPE
with spring dm
[KARAF-4275] StaticConfigurationAdmin and NPE with spring dm
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ee9612a0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ee9612a0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ee9612a0
Branch: refs/heads/master
Commit: ee9612a0cbfcac05eaa149a0c3c6c46968ce2695
Parents: d8be337
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Feb 10 08:59:26 2017 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Feb 10 08:59:26 2017 +0100
----------------------------------------------------------------------
.../apache/karaf/services/staticcm/StaticConfigAdminImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ee9612a0/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
----------------------------------------------------------------------
diff --git a/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java b/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
index d6e8d92..0d353fa 100644
--- a/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
+++ b/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/StaticConfigAdminImpl.java
@@ -20,6 +20,7 @@ package org.apache.karaf.services.staticcm;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Hashtable;
import java.util.List;
import java.util.Objects;
@@ -134,7 +135,9 @@ public class StaticConfigAdminImpl implements ConfigurationAdmin {
return config;
}
}
- return null;
+ Hashtable<String, Object> cfg = new Hashtable<>();
+ cfg.put(Constants.SERVICE_PID, pid);
+ return new StaticConfigurationImpl(pid, null, cfg);
}
@Override