Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use logical 'and' instead of bitwise 'and'

Browse Source 
Closes gh-8198
This commit is contained in:
Johnny Lim
2017-02-06 11:01:18 +09:00
committed by Stephane Nicoll
parent b4858882f3
commit 0adab8a2be
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
View File

@@ -99,10 +99,10 @@ public final class LoggerConfiguration {
if (obj instanceof LoggerConfiguration) {
LoggerConfiguration other = (LoggerConfiguration) obj;
boolean rtn = true;
rtn &= ObjectUtils.nullSafeEquals(this.name, other.name);
rtn &= ObjectUtils.nullSafeEquals(this.configuredLevel,
rtn = rtn && ObjectUtils.nullSafeEquals(this.name, other.name);
rtn = rtn && ObjectUtils.nullSafeEquals(this.configuredLevel,
other.configuredLevel);
rtn &= ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel);
rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel);
return rtn;
}
return super.equals(obj);

6
spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPage.java
View File

@@ -125,10 +125,10 @@ public class ErrorPage {
if (obj instanceof ErrorPage) {
ErrorPage other = (ErrorPage) obj;
boolean rtn = true;
rtn &= ObjectUtils.nullSafeEquals(getExceptionName(),
rtn = rtn && ObjectUtils.nullSafeEquals(getExceptionName(),
other.getExceptionName());
rtn &= ObjectUtils.nullSafeEquals(this.path, other.path);
rtn &= this.status == other.status;
rtn = rtn && ObjectUtils.nullSafeEquals(this.path, other.path);
rtn = rtn && this.status == other.status;
return rtn;
}
return false;