Fix failing unit tests due to KARAF-1169 and KARAF-3006 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/49afe847 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/49afe847 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/49afe847
Branch: refs/heads/master Commit: 49afe847f7f6833399c19151d98fe10a805374c4 Parents: 3ac0b00 Author: Guillaume Nodet <gno...@gmail.com> Authored: Wed May 28 13:48:28 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Wed May 28 13:48:28 2014 +0200 ---------------------------------------------------------------------- .../karaf/features/internal/model/Feature.java | 6 ++-- .../karaf/jaas/command/ManageRealmCommand.java | 33 ++++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/49afe847/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java index 924d68c..3c09ddc 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java @@ -95,7 +95,7 @@ public class Feature extends Content implements org.apache.karaf.features.Featur @XmlAttribute(name = "start-level") protected Integer startLevel; @XmlAttribute - protected boolean hidden; + protected Boolean hidden; protected List<Conditional> conditional; protected List<Capability> capability; protected List<Requirement> requirement; @@ -265,13 +265,13 @@ public class Feature extends Content implements org.apache.karaf.features.Featur * Gets the value of the hidden property. */ public boolean isHidden() { - return hidden; + return hidden == null ? false : hidden; } /** * Sets the value of the hidden property. */ - public void setHidden(boolean value) { + public void setHidden(Boolean value) { this.hidden = value; } http://git-wip-us.apache.org/repos/asf/karaf/blob/49afe847/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java ---------------------------------------------------------------------- diff --git a/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java b/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java index a9fa13b..58375c6 100644 --- a/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java +++ b/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java @@ -91,23 +91,24 @@ public class ManageRealmCommand extends JaasCommandSupport { for (JaasRealm r : realms) { if (r.getName().equals(realmName)) { realm = r; - break; - } - } - - } - AppConfigurationEntry[] entries = realm.getEntries(); - if (entries != null) { - for (AppConfigurationEntry e : entries) { - String moduleClass = (String) e.getOptions().get(ProxyLoginModule.PROPERTY_MODULE); - if (moduleName == null) { - entry = e; - break; - } else { - if (moduleName.equals(e.getLoginModuleName()) || moduleName.equals(moduleClass)) { - entry = e; - break; + AppConfigurationEntry[] entries = realm.getEntries(); + if (entries != null) { + for (AppConfigurationEntry e : entries) { + String moduleClass = (String) e.getOptions().get(ProxyLoginModule.PROPERTY_MODULE); + if (moduleName == null) { + if (getBackingEngine(e) != null) { + entry = e; + break; + } + } else { + if (moduleName.equals(e.getLoginModuleName()) || moduleName.equals(moduleClass)) { + entry = e; + break; + } + } + } } + break; } } }