cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 784288e
Date Sat, 30 Aug 2014 12:36:07 GMT
SAML2AuthManagerImpl: let the component return true on start

- Return super.true() even if plugin is not enabled
- Return empty list when getCommands is called

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/784288ea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/784288ea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/784288ea

Branch: refs/heads/master
Commit: 784288eaaba7eec6db18f728893f7bc382b53550
Parents: 2bff595
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Sat Aug 30 14:32:54 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Sat Aug 30 14:32:54 2014 +0200

----------------------------------------------------------------------
 .../org/apache/cloudstack/saml/SAML2AuthManagerImpl.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/784288ea/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java
----------------------------------------------------------------------
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
index 8480c0e..aa06320 100644
--- 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 @@ public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManage
 
     @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);


Mime
View raw message