提交 10123530 authored 作者: mysinmyc's avatar mysinmyc

removed initialization (due to dbsetting persisted)

上级 b1a5ecff
...@@ -210,7 +210,6 @@ public class Database implements DataHandler { ...@@ -210,7 +210,6 @@ public class Database implements DataHandler {
private RowFactory rowFactory = RowFactory.DEFAULT; private RowFactory rowFactory = RowFactory.DEFAULT;
private Authenticator authenticator; private Authenticator authenticator;
private boolean authenticatorInitialized;
public Database(ConnectionInfo ci, String cipher) { public Database(ConnectionInfo ci, String cipher) {
META_LOCK_DEBUGGING.set(null); META_LOCK_DEBUGGING.set(null);
...@@ -2952,30 +2951,11 @@ public class Database implements DataHandler { ...@@ -2952,30 +2951,11 @@ public class Database implements DataHandler {
return engine; return engine;
} }
private void initAuthenticator() {
if (authenticatorInitialized) {
return;
}
try {
String authenticatorString=null;
Setting authenticatorSetting =findSetting("AUTHENTICATOR");
if (authenticatorSetting==null) {
setAuthenticator(null);
} else {
authenticatorString = authenticatorSetting.getStringValue();
setAuthenticator(AuthenticatorBuilder.buildAuthenticator(authenticatorString));
}
} catch (Exception e) {
throw DbException.convert(e);
}
}
/** /**
* get authenticator for database users * get authenticator for database users
* @return authenticator set for database * @return authenticator set for database
*/ */
public Authenticator getAuthenticator() { public Authenticator getAuthenticator() {
initAuthenticator();
return authenticator == null ? InternalAuthenticator.INSTANCE : authenticator; return authenticator == null ? InternalAuthenticator.INSTANCE : authenticator;
} }
...@@ -2989,6 +2969,5 @@ public class Database implements DataHandler { ...@@ -2989,6 +2969,5 @@ public class Database implements DataHandler {
authenticator.init(this); authenticator.init(this);
}; };
this.authenticator=authenticator; this.authenticator=authenticator;
authenticatorInitialized = true;
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论