提交 272423cb authored 作者: Thomas Mueller's avatar Thomas Mueller

--no commit message

--no commit message
上级 7d29b8ad
...@@ -21,7 +21,8 @@ Change Log ...@@ -21,7 +21,8 @@ Change Log
<ul><li>Multiple processes can now access the same database without having to explicitly <ul><li>Multiple processes can now access the same database without having to explicitly
start the server. To do that, append ;AUTO_SERVER=TRUE to the database URL. start the server. To do that, append ;AUTO_SERVER=TRUE to the database URL.
In this case, the server is started automatically if the connection is in embedded mode, In this case, the server is started automatically if the connection is in embedded mode,
and the server mode is used if a server is running. and the server mode is used if a server is running. If the process that opened the first
connection is closed, the other client need to reconnect (there is no automatic re-connect so far).
</li><li>The server tool now displays the correct IP address if networked. </li><li>The server tool now displays the correct IP address if networked.
</li><li>Can now start a TCP server with port 0 (automatically select a port). </li><li>Can now start a TCP server with port 0 (automatically select a port).
</li><li>LOB files are now stored in sub-directories by default for new databases. </li><li>LOB files are now stored in sub-directories by default for new databases.
......
...@@ -137,7 +137,7 @@ public abstract class TestBase { ...@@ -137,7 +137,7 @@ public abstract class TestBase {
} }
protected String getPassword(String userPassword) { protected String getPassword(String userPassword) {
return config.cipher == null ? userPassword : "filePassword " + userPassword; return config == null || config.cipher == null ? userPassword : "filePassword " + userPassword;
} }
protected String getPassword() { protected String getPassword() {
......
...@@ -30,7 +30,7 @@ public class TestListener extends TestBase implements DatabaseEventListener { ...@@ -30,7 +30,7 @@ public class TestListener extends TestBase implements DatabaseEventListener {
} }
public void test() throws SQLException { public void test() throws SQLException {
if (config.networked) { if (config.networked || config.cipher != null) {
return; return;
} }
deleteDb("listener"); deleteDb("listener");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论