handling null pointer exception and updating integration tests for ch…

…anges made as a part of FINERACT-590
swagatikapanda123 · Feb 10, 2018 · e3ce5f3 · e3ce5f3
1 parent 8ac5485
commit e3ce5f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...tegrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java b/...tegrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java
@@ -373,8 +373,9 @@ private void createAndValidateClientBasedOnAccountPreference() {
         }
     }
 
-    private void validateAccountNumberLengthAndStartsWithPrefix(final String accountNumber, final String prefix) {
+    private void validateAccountNumberLengthAndStartsWithPrefix(final String accountNumber, String prefix) {
         if (prefix != null) {
+        		prefix = prefix.substring(0, Math.min(prefix.length(), 10));
             Assert.assertEquals(accountNumber.length(), prefix.length() + 9);
             Assert.assertTrue(accountNumber.startsWith(prefix));
         } else {

diff --git a/...der/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java b/...der/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
@@ -111,7 +111,9 @@ private String generateAccountNumber(Map<String, String> propertyMap, AccountNum
 
             // FINERACT-590
             // Because account_no is limited to 20 chars, we can only use the first 10 chars of prefix - trim if necessary
-            prefix = prefix.substring(0, Math.min(prefix.length(), 10));
+            if (prefix != null) {
+                prefix = prefix.substring(0, Math.min(prefix.length(), 10));
+            }
 
             accountNumber = StringUtils.overlay(accountNumber, prefix, 0, 0);
         }