[DS-806] Item.match() incorrect logic for schema testing

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6053 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/content/Item.java

@@ -908,7 +908,8 @@ public class Item extends DSpaceObject
                 return false;
             }
         }
-        else if (!schema.equals(Item.ANY))
+
+        if (!schema.equals(Item.ANY))
         {
             if (dcv.schema != null && !dcv.schema.equals(schema))
             {

dspace-api/src/test/java/org/dspace/content/ItemTest.java

@@ -290,8 +290,6 @@ public class ItemTest  extends AbstractDSpaceObjectTest
         DCValue[] dc = it.getMetadata(schema, element, qualifier, lang);
         assertThat("testGetMetadata_4args 0",dc,notNullValue());
         assertTrue("testGetMetadata_4args 1",dc.length == 0);
-
-
     }
 
     /**

dspace/CHANGES

@@ -8,7 +8,7 @@ In addition, a listing of all known contributors to DSpace software can be
 found online at: https://wiki.duraspace.org/display/DSPACE/DSpaceContributors
 
 1.7.1
-
+=====
 (Ivan Masar, Claudia Juergen)
 - [DS-798] Czech localization of 1.7.0 - jspui translation Messages_cs.properties, changes in dspace-api-lang
 - [DS-798] Czech localization of 1.7.0 - xmlui translation messages_cs.xml, changes in dspace-xmlui-lang
@@ -34,6 +34,10 @@ found online at: https://wiki.duraspace.org/display/DSPACE/DSpaceContributors
 (Ben Bosman)
 - [DS-809] Support for empty dc.abstract dim field in Internet Explorer
 
+(Stuart Lewis, Kim Shepherd)
+- [DS-806] Item.match() incorrect logic for schema testing
+
+
 1.7.0
 =====
 (Oleksandr Sytnyk)