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 2014/05/26 22:45:07 UTC
[2/5] git commit: Fix possible NPE
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/da4aa4c5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/da4aa4c5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/da4aa4c5
Branch: refs/heads/master
Commit: da4aa4c59698c39929d565ae83cf0696311ab671
Parents: 687ba28
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon May 26 09:01:14 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon May 26 13:28:23 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/jaas/modules/impl/KarafRealm.java | 8 +++++---
.../org/apache/karaf/shell/impl/console/osgi/Activator.java | 6 ++++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/da4aa4c5/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
index d1d838c..a04d5ac 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
@@ -67,9 +67,11 @@ public class KarafRealm implements JaasRealm, ManagedService {
public void updated(Dictionary<String, ?> properties) throws ConfigurationException {
Map<String, Object> props = new HashMap<String, Object>();
populateDefault(props);
- for (Enumeration<String> keyEnum = properties.keys(); keyEnum.hasMoreElements(); ) {
- String key = keyEnum.nextElement();
- props.put(key, properties.get(key));
+ if (properties != null) {
+ for (Enumeration<String> keyEnum = properties.keys(); keyEnum.hasMoreElements(); ) {
+ String key = keyEnum.nextElement();
+ props.put(key, properties.get(key));
+ }
}
this.properties = props;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/da4aa4c5/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java
index e595081..9c328d4 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Activator.java
@@ -80,11 +80,13 @@ public class Activator implements BundleActivator {
@Override
public void stop(BundleContext context) throws Exception {
sessionFactoryRegistration.unregister();
- localConsoleManager.stop();
+ if (localConsoleManager != null) {
+ localConsoleManager.stop();
+ terminalFactory.destroy();
+ }
sessionFactory.stop();
actionExtender.stop(context);
threadIO.stop();
- terminalFactory.destroy();
if (eventAdminListener != null) {
eventAdminListener.close();
}