directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cp...@apache.org
Subject [09/15] directory-fortress-core git commit: fixed circular loop with config instead of local config
Date Thu, 05 May 2016 13:49:26 GMT
fixed circular loop with config instead of local config


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/07d205a1
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/07d205a1
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/07d205a1

Branch: refs/heads/master
Commit: 07d205a11f3d292adc7b5e8748ef56ceb8520581
Parents: ecf623b
Author: clp207 <clp207@psu.edu>
Authored: Tue Apr 26 19:31:18 2016 -0400
Committer: clp207 <clp207@psu.edu>
Committed: Tue Apr 26 19:31:18 2016 -0400

----------------------------------------------------------------------
 .../apache/directory/fortress/core/util/crypto/EncryptUtil.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/07d205a1/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
b/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
index d2bd30f..be17eac 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
@@ -19,7 +19,6 @@
  */
 package org.apache.directory.fortress.core.util.crypto;
 
-import org.apache.directory.fortress.core.util.Config;
 import org.apache.directory.fortress.core.util.LocalConfig;
 import org.jasypt.util.text.BasicTextEncryptor;
 
@@ -85,7 +84,7 @@ public final class EncryptUtil
     public static boolean isEnabled()
     {
         boolean result = false;
-        if(LocalConfig.getInstance().getProperty(CRYPTO_PROP)!= null && !Config.getInstance().getProperty(CRYPTO_PROP).equals("${crypto.prop}"))
+        if(LocalConfig.getInstance().getProperty(CRYPTO_PROP)!= null && !LocalConfig.getInstance().getProperty(CRYPTO_PROP).equals("${crypto.prop}"))
         {
             result = true;
         }


Mime
View raw message