You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/03/11 17:17:30 UTC
[13/14] kylin git commit: KYLIN-2305 Unable to use long
searchBase/Pattern for LDAP
KYLIN-2305 Unable to use long searchBase/Pattern for LDAP
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/181b6c5c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/181b6c5c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/181b6c5c
Branch: refs/heads/KYLIN-2360
Commit: 181b6c5c16fc0506a475993f3735a4b7e73a07c1
Parents: 0cb5032
Author: otomarukanta <kk...@yahoo-corp.jp>
Authored: Fri Mar 10 16:34:52 2017 +0900
Committer: shaofengshi <sh...@apache.org>
Committed: Sat Mar 11 22:12:55 2017 +0800
----------------------------------------------------------------------
.../kylin/rest/security/PasswordPlaceholderConfigurer.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/181b6c5c/server-base/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java b/server-base/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
index 5bb6d54..095b74a 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/security/PasswordPlaceholderConfigurer.java
@@ -18,6 +18,7 @@
package org.apache.kylin.rest.security;
+import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -51,12 +52,12 @@ public class PasswordPlaceholderConfigurer extends PropertyPlaceholderConfigurer
/**
* The PasswordPlaceholderConfigurer will read Kylin properties as the Spring resource
*/
- public PasswordPlaceholderConfigurer() {
+ public PasswordPlaceholderConfigurer() throws IOException {
Resource[] resources = new Resource[1];
//Properties prop = KylinConfig.getKylinProperties();
Properties prop = getAllKylinProperties();
StringWriter writer = new StringWriter();
- prop.list(new PrintWriter(writer));
+ prop.store(new PrintWriter(writer), "kylin properties");
String propString = writer.getBuffer().toString();
IOUtils.closeQuietly(writer);
InputStream is = IOUtils.toInputStream(propString, Charset.defaultCharset());