[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'release/jon3.2.x' - modules/enterprise
From:       Simeon Pinder <spinder () fedoraproject ! org>
Date:       2013-11-27 22:04:45
Message-ID: 20131127220445.EB8DE60F5F () fedorahosted ! org
[Download RAW message or body]

 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java \
|    2 +-  1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06e0317aa27afdfd00f4bfc584b3bffb62ae75c9
Author: Simeon Pinder <spinder@fulliautomatix.conchfritter.com>
Date:   Wed Nov 27 10:39:25 2013 -0500

     [BZ 1034236] One more property check for original and updated property parsing.

diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
 index 2fc875d..a042e77 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
                
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
 @@ -683,7 +683,7 @@ SystemSetting.LDAP_GROUP_QUERY_PAGE_SIZE.name(), ""
 
         // Setup SSL if requested
         String value = \
                env.getProperty(SystemSetting.USE_SSL_FOR_LDAP.getInternalName());
-        boolean ldapSsl = "ssl".equalsIgnoreCase(value);
+        boolean ldapSsl = "ssl".equalsIgnoreCase(value) || \
"true".equalsIgnoreCase(value);  if (ldapSsl) {
             String ldapSocketFactory = \
env.getProperty("java.naming.ldap.factory.socket");  if (ldapSocketFactory == null) {


_______________________________________________
rhq-commits mailing list
rhq-commits@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/rhq-commits


[prev in list] [next in list] [prev in thread] [next in thread]