svn commit: r1637896 - in /openmeetings: branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java

[solomax]

Author: solomax
Date: Mon Nov 10 15:52:54 2014
New Revision: 1637896

URL: http://svn.apache.org/r1637896
Log:
[OPENMEETINGS-1114] LDAP config is being read in UTF-8

Modified:
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
    
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1637896&r1=1637895&r2=1637896&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
 Mon Nov 10 15:52:54 2014
@@ -24,7 +24,8 @@ import static org.apache.openmeetings.ut
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.Date;
 import java.util.Properties;
 import java.util.Set;
@@ -170,18 +171,18 @@ public class LdapLoginManagement {
                log.debug("LdapLoginmanagement.doLdapLogin");
 
                Properties config = new Properties();
-               InputStream pis = null;
+               Reader r = null;
                try {
                        LdapConfig ldapConfig = ldapConfigDao.get(domainId);
-                       pis = new FileInputStream(new 
File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
-                       config.load(pis);
+                       r = new InputStreamReader(new FileInputStream(new 
File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName())), "UTF-8");
+                       config.load(r);
                } catch (Exception e) {
                        log.error("Error on LdapLogin : Configurationdata 
couldnt be retrieved!");
                        return null;
                } finally {
-                       if (pis != null) {
+                       if (r != null) {
                                try {
-                                       pis.close();
+                                       r.close();
                                } catch (IOException e) {
                                        log.error("Error while closing ldap 
config file");
                                        return null;

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1637896&r1=1637895&r2=1637896&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
 Mon Nov 10 15:52:54 2014
@@ -24,7 +24,8 @@ import static org.apache.openmeetings.ut
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.Date;
 import java.util.Properties;
 import java.util.Set;
@@ -170,18 +171,18 @@ public class LdapLoginManagement {
                log.debug("LdapLoginmanagement.doLdapLogin");
 
                Properties config = new Properties();
-               InputStream pis = null;
+               Reader r = null;
                try {
                        LdapConfig ldapConfig = ldapConfigDao.get(domainId);
-                       pis = new FileInputStream(new 
File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
-                       config.load(pis);
+                       r = new InputStreamReader(new FileInputStream(new 
File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName())), "UTF-8");
+                       config.load(r);
                } catch (Exception e) {
                        log.error("Error on LdapLogin : Configurationdata 
couldnt be retrieved!");
                        return null;
                } finally {
-                       if (pis != null) {
+                       if (r != null) {
                                try {
-                                       pis.close();
+                                       r.close();
                                } catch (IOException e) {
                                        log.error("Error while closing ldap 
config file");
                                        return null;