Merge pull request DSpace#11886 from DSpace/backport-11677-to-dspace-9_x

[Port dspace-9_x] Fix NullPointerException in VersionHistoryService.getVersion() method

Author: tdonohue

dspace-api/src/main/java/org/dspace/versioning/VersionHistoryServiceImpl.java

@@ -109,9 +109,6 @@ public Version getVersion(Context context, VersionHistory versionHistory, Item i
         throws SQLException {
         Version v = versioningService.getVersion(context, item);
         if (v != null) {
-            ;
-        }
-        {
             if (versionHistory.equals(v.getVersionHistory())) {
                 return v;
             }

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

@@ -170,4 +170,23 @@ public void testVersionDelete() throws Exception {
         assertThat("Test_version_handle_delete", handleService.resolveToObject(context, handle), nullValue());
         context.restoreAuthSystemState();
     }
+
+    @Test
+    public void testGetVersionWithNullPointerException() throws Exception {
+        context.turnOffAuthorisationSystem();
+        // Create item without version
+        Community community = communityService.create(null, context);
+        Collection col = collectionService.create(context, community);
+        WorkspaceItem is = workspaceItemService.create(context, col, false);
+        Item itemWithoutVersion = installItemService.installItem(context, is);
+        VersionHistory versionHistory = versionHistoryService.findByItem(context, originalItem);
+        try {
+            Version result = versionHistoryService.getVersion(context, versionHistory, itemWithoutVersion);
+            assertThat("getVersion should return null for item without version", result, nullValue());
+        } catch (NullPointerException npe) {
+            fail("NullPointerException should not be thrown. Method should return null: " + npe.getMessage());
+        } finally {
+            context.restoreAuthSystemState();
+        }
+    }
 }