You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/11/05 18:33:13 UTC

[06/20] git commit: o Declared a static field for the createInstance method name, avoiding a concatenation later o Used the Strings.isEmpty() method

o Declared a static field for the createInstance method name, avoiding a
concatenation later
o Used the Strings.isEmpty() method

Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/4451b020
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/4451b020
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/4451b020

Branch: refs/heads/master
Commit: 4451b020760cef8eef8798e414e73cd617803ab7
Parents: a8533c8
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sun Nov 2 16:59:13 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sun Nov 2 16:59:13 2014 +0100

----------------------------------------------------------------------
 .../directory/fortress/core/DelAdminMgrFactory.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4451b020/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
index 649cc47..1db31d6 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.fortress.core;
 
+import org.apache.directory.api.util.Strings;
 import org.apache.directory.fortress.core.cfg.Config;
 import org.apache.directory.fortress.core.rbac.ClassUtil;
 import org.apache.directory.fortress.core.rbac.DelAdminMgrImpl;
@@ -39,6 +40,7 @@ public class DelAdminMgrFactory
 {
     private static String dAdminClassName = Config.getProperty(GlobalIds.DELEGATED_ADMIN_IMPLEMENTATION);
     private static final String CLS_NM = DelAdminMgrFactory.class.getName();
+    private static final String CREATE_INSTANCE_METHOD = CLS_NM + ".createInstance";
 
     /**
      * Create and return a reference to {@link DelAdminMgr} object using HOME context.
@@ -62,10 +64,11 @@ public class DelAdminMgrFactory
     public static DelAdminMgr createInstance(String contextId)
         throws SecurityException
     {
-        VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
-        if (!VUtil.isNotNullOrEmpty(dAdminClassName))
+        VUtil.assertNotNull( contextId, GlobalErrIds.CONTEXT_NULL, CREATE_INSTANCE_METHOD );
+        
+        if ( Strings.isEmpty( dAdminClassName ) )
         {
-            if(GlobalIds.IS_REST)
+            if ( GlobalIds.IS_REST )
             {
                 dAdminClassName = DelAdminMgrRestImpl.class.getName();
             }
@@ -75,8 +78,9 @@ public class DelAdminMgrFactory
             }
         }
 
-        DelAdminMgr delAdminMgr = (DelAdminMgr) ClassUtil.createInstance(dAdminClassName);
+        DelAdminMgr delAdminMgr = (DelAdminMgr) ClassUtil.createInstance( dAdminClassName );
         delAdminMgr.setContextId(contextId);
+        
         return delAdminMgr;
     }