From 48749e7a87301752f91234361805ba68eb7371ca Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 20 May 2014 10:52:56 +0200 Subject: [PATCH] #178 - Fixed potential NullPointerException in ResourceSupport. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ResourceSupport now has a null guard in equals(…) to prevent NullPointerExceptions from happening. --- .../org/springframework/hateoas/ResourceSupport.java | 2 +- .../hateoas/ResourceSupportUnitTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/hateoas/ResourceSupport.java b/src/main/java/org/springframework/hateoas/ResourceSupport.java index ca1351f6..5966e56d 100755 --- a/src/main/java/org/springframework/hateoas/ResourceSupport.java +++ b/src/main/java/org/springframework/hateoas/ResourceSupport.java @@ -142,7 +142,7 @@ public class ResourceSupport implements Identifiable { return true; } - if (!obj.getClass().equals(this.getClass())) { + if (obj == null || !obj.getClass().equals(this.getClass())) { return false; } diff --git a/src/test/java/org/springframework/hateoas/ResourceSupportUnitTest.java b/src/test/java/org/springframework/hateoas/ResourceSupportUnitTest.java index 9ce31d99..3b07a8ff 100644 --- a/src/test/java/org/springframework/hateoas/ResourceSupportUnitTest.java +++ b/src/test/java/org/springframework/hateoas/ResourceSupportUnitTest.java @@ -133,4 +133,14 @@ public class ResourceSupportUnitTest { TestUtils.assertNotEqualAndDifferentHashCode(left, right); } + + /** + * @see #178 + */ + @Test + public void doesNotEqualNull() { + + ResourceSupport support = new ResourceSupport(); + assertThat(support.equals(null), is(false)); + } }