SAML2AuthManagerImpl: let the component return true on start

yadvr · yadvr · commit 784288eaaba7 · 2014-08-30T14:32:54.000+02:00
- Return super.true() even if plugin is not enabled
- Return empty list when getCommands is called

Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
@@ -71,7 +71,10 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
 
     @Override
     public boolean start() {
-        return isSAMLPluginEnabled() && setup();
+        if (isSAMLPluginEnabled()) {
+            setup();
+        }
+        return super.start();
     }
 
     private boolean setup() {
@@ -147,10 +150,10 @@ private boolean setup() {
 
     @Override
     public List<Class<?>> getAuthCommands() {
+        List<Class<?>> cmdList = new ArrayList<Class<?>>();
         if (!isSAMLPluginEnabled()) {
-            return null;
+            return cmdList;
         }
-        List<Class<?>> cmdList = new ArrayList<Class<?>>();
         cmdList.add(SAML2LoginAPIAuthenticatorCmd.class);
         cmdList.add(SAML2LogoutAPIAuthenticatorCmd.class);
         cmdList.add(GetServiceProviderMetaDataCmd.class);
