# HG changeset patch # User Anton Epple # Date 1369643949 -7200 # Node ID edda08aba4690a144ebd96d3cfc907714726b654 # Parent 2c1c6b0f5840684458a86fca19518e0cea92ea1c added cached object to image hashCode/equals diff -r 2c1c6b0f5840 -r edda08aba469 javaquery/canvas/src/main/java/net/java/html/canvas/Image.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/Image.java Mon May 27 10:24:34 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/Image.java Mon May 27 10:39:09 2013 +0200 @@ -55,7 +55,7 @@ @Override public int hashCode() { int hash = 7; - hash = 59 * hash + Objects.hashCode(this.src); + hash = 59 * hash + Objects.hashCode(this.src) ^ (cached==null? 1231 : 1237); return hash; } @@ -71,6 +71,9 @@ if (!Objects.equals(this.src, other.src)) { return false; } + if ((cached==null) != (other.getCached()==null)){ + return false; + } return true; }