Merge pull request #10468 from dreis2211:short-circuit-cleanup

* pr/10468:
  Remove non short-circuit expression in Neo4jPropertiesTests
This commit is contained in:
Stephane Nicoll
2017-10-02 09:13:04 +02:00

View File

@@ -157,7 +157,7 @@ public class Neo4jPropertiesTests {
private static void assertCredentials(Configuration actual, String username,
String password) {
Credentials<?> credentials = actual.getCredentials();
if (username == null & password == null) {
if (username == null && password == null) {
assertThat(credentials).isNull();
}
else {