You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/11/01 07:59:30 UTC
svn commit: r1767443 - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/
trunk/openmeetings-core/src/main/ja...
Author: solomax
Date: Tue Nov 1 07:59:30 2016
New Revision: 1767443
URL: http://svn.apache.org/viewvc?rev=1767443&view=rev
Log:
no jira: whitespaces clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1767443&r1=1767442&r2=1767443&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Tue Nov 1 07:59:30 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.core.ldap;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -28,7 +29,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -186,7 +186,7 @@ public class LdapLoginManagement {
bindAdmin(w.conn, w.options);
Dn baseDn = new Dn(w.options.searchBase);
String searchQ = String.format(w.options.searchQuery, login);
-
+
try (EntryCursor cursor = new EntryCursorImpl(w.conn.search(
new SearchRequestImpl()
.setBase(baseDn)
@@ -315,7 +315,7 @@ public class LdapLoginManagement {
this.domainId = domainId;
LdapConfig ldapConfig = ldapConfigDao.get(domainId);
try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
- Reader r = new InputStreamReader(is, StandardCharsets.UTF_8))
+ Reader r = new InputStreamReader(is, UTF_8))
{
config.load(r);
if (config.isEmpty()) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1767443&r1=1767442&r2=1767443&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Tue Nov 1 07:59:30 2016
@@ -186,7 +186,7 @@ public class LdapLoginManagement {
bindAdmin(w.conn, w.options);
Dn baseDn = new Dn(w.options.searchBase);
String searchQ = String.format(w.options.searchQuery, login);
-
+
try (EntryCursor cursor = new EntryCursorImpl(w.conn.search(
new SearchRequestImpl()
.setBase(baseDn)
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1767443&r1=1767442&r2=1767443&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Tue Nov 1 07:59:30 2016
@@ -186,7 +186,7 @@ public class LdapLoginManagement {
bindAdmin(w.conn, w.options);
Dn baseDn = new Dn(w.options.searchBase);
String searchQ = String.format(w.options.searchQuery, login);
-
+
try (EntryCursor cursor = new EntryCursorImpl(w.conn.search(
new SearchRequestImpl()
.setBase(baseDn)