diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java index 1d7422bc0d7307dbd05f2666a2d04a4f16ee6046..98b68c4a195065540db35c12c89e320b4413fbd2 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java @@ -112,6 +112,7 @@ public class MaterialUploadSectionsParser final String fileName = multipartFile.getOriginalFilename(); final String loweredFileName = fileName.toLowerCase(); String registrationMessage = "Registration/update of %d material(s) is complete."; + int materialCounter = 0; if (loweredFileName.endsWith("xls") || loweredFileName.endsWith("xlsx")) { List<ExcelFileSection> materialSections = new ArrayList<ExcelFileSection>(); @@ -126,7 +127,6 @@ public class MaterialUploadSectionsParser multipartFile.getInputStream(), materialType.getCode(), loweredFileName)); } - int materialCounter = 0; Map<String, String> defaults = new HashMap<String, String>(); for (ExcelFileSection fs : materialSections) { @@ -164,8 +164,6 @@ public class MaterialUploadSectionsParser } } } - results.add(new BatchRegistrationResult(fileName, String.format( - registrationMessage, materialCounter))); } else { @@ -179,7 +177,6 @@ public class MaterialUploadSectionsParser materialSections.add(FileSection.createFromInputStream( multipartFile.getInputStream(), materialType.getCode())); } - int materialCounter = 0; Map<String, String> defaults = new HashMap<String, String>(); for (FileSection fs : materialSections) { @@ -217,9 +214,9 @@ public class MaterialUploadSectionsParser } } } - results.add(new BatchRegistrationResult(fileName, String.format( - registrationMessage, materialCounter))); } + results.add(new BatchRegistrationResult(fileName, String.format( + registrationMessage, materialCounter))); } return results; } diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.java index 71cffe61b5636daeb30d4674a01bff083cec3b42..99e6cf9460326571a17c67d031b31e319af314d4 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.java @@ -94,7 +94,8 @@ public class BatchMaterialRegistrationAndUpdateTest extends SystemTestCase List<BatchRegistrationResult> result = registerMaterials(materialBatchData); - assertEquals("Registration of 2 material(s) is complete.", result.get(0).getMessage()); + assertEquals("Registration/update of 2 material(s) is complete.", result.get(0) + .getMessage()); assertEquals(1, result.size()); assertProperties("[COMMENT: x & y, DESCRIPTION: compound 1, SIZE: 42]", "C1");