JERSEY-3069: LanguageTag#equals(...) fix.

Change-Id: I040a43117a1979db8beb5d5d8498fa6e93390525

Author: pavelbucek

core-common/src/main/java/org/glassfish/jersey/message/internal/AcceptableLanguageTag.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -89,10 +89,7 @@ public boolean equals(Object obj) {
             return false;
         }
         final AcceptableLanguageTag other = (AcceptableLanguageTag) obj;
-        if (this.quality != other.quality) {
-            return false;
-        }
-        return true;
+        return this.quality == other.quality;
     }
 
     @Override

core-common/src/main/java/org/glassfish/jersey/message/internal/LanguageTag.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -178,7 +178,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof LanguageTag) || o.getClass() == this.getClass()) {
+        if (!(o instanceof LanguageTag) || o.getClass() != this.getClass()) {
             return false;
         }
 

core-common/src/test/java/org/glassfish/jersey/message/internal/LanguageTagTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -45,6 +45,8 @@
 import org.junit.Test;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalToIgnoringCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for {@link LanguageTag} class.
@@ -70,6 +72,22 @@ public void testLanguageRegion() throws Exception {
         _test("es", "419");
     }
 
+    @Test
+    public void testEquals() {
+        LanguageTag lt1 = new LanguageTag("en", "us");
+        LanguageTag lt2 = new LanguageTag("en", "us");
+
+        assertTrue(lt1.equals(lt2));
+    }
+
+    @Test
+    public void testNonEquals() {
+        LanguageTag lt1 = new LanguageTag("en", "us");
+        LanguageTag lt2 = new LanguageTag("en", "gb");
+
+        assertFalse(lt1.equals(lt2));
+    }
+
     private void _test(final String primary, final String sub) throws Exception {
         final LanguageTag tag = LanguageTag.valueOf(primary + "-" + sub);