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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2017-02-06 10:38:16 +01:00
parent d8e1297eed e9057354c2
commit cfdc75d384
13 changed files with 185 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java
View File

@@ -59,9 +59,9 @@ class FileSnapshot {
if (obj instanceof FileSnapshot) {
FileSnapshot other = (FileSnapshot) obj;
boolean equals = this.file.equals(other.file);
equals &= this.exists == other.exists;
equals &= this.length == other.length;
equals &= this.lastModified == other.lastModified;
equals = equals && this.exists == other.exists;
equals = equals && this.length == other.length;
equals = equals && this.lastModified == other.lastModified;
return equals;
}
return super.equals(obj);