CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 19 Packages Projects Releases Wiki Activity

FINERACT-1004 Resolved NPE in AddressWritePlatformServiceImpl.updateClientAddress()

Browse Source
This commit is contained in:
nnatarajan
2020-06-03 09:55:24 +02:00
committed by Michael Vorburger ⛑️
parent 0c6903fc36
commit 97cbb13c9c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressWritePlatformServiceImpl.java
+5 -2
View File
@@ -29,6 +29,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuild
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.portfolio.address.domain.Address; import org.apache.fineract.portfolio.address.domain.Address;
import org.apache.fineract.portfolio.address.domain.AddressRepository; import org.apache.fineract.portfolio.address.domain.AddressRepository;
import org.apache.fineract.portfolio.address.exception.AddressNotFoundException;
import org.apache.fineract.portfolio.address.serialization.AddressCommandFromApiJsonDeserializer; import org.apache.fineract.portfolio.address.serialization.AddressCommandFromApiJsonDeserializer;
import org.apache.fineract.portfolio.client.domain.Client; import org.apache.fineract.portfolio.client.domain.Client;
import org.apache.fineract.portfolio.client.domain.ClientAddress; import org.apache.fineract.portfolio.client.domain.ClientAddress;
@@ -183,6 +184,10 @@ public class AddressWritePlatformServiceImpl implements AddressWritePlatformServ
final ClientAddress clientAddressObj = this.clientAddressRepositoryWrapper final ClientAddress clientAddressObj = this.clientAddressRepositoryWrapper
.findOneByClientIdAndAddressId(clientId, addressId); .findOneByClientIdAndAddressId(clientId, addressId);
if (clientAddressObj == null) {
throw new AddressNotFoundException(clientId);
}
final Address addobj = this.addressRepository.getOne(addressId); final Address addobj = this.addressRepository.getOne(addressId);
if (!(command.stringValueOfParameterNamed("street").isEmpty())) { if (!(command.stringValueOfParameterNamed("street").isEmpty())) {
@@ -281,10 +286,8 @@ public class AddressWritePlatformServiceImpl implements AddressWritePlatformServ
final Boolean testActive = command.booleanPrimitiveValueOfParameterNamed("isActive"); final Boolean testActive = command.booleanPrimitiveValueOfParameterNamed("isActive");
if (testActive != null) { if (testActive != null) {
final boolean active = command.booleanPrimitiveValueOfParameterNamed("isActive"); final boolean active = command.booleanPrimitiveValueOfParameterNamed("isActive");
clientAddressObj.setIs_active(active); clientAddressObj.setIs_active(active);
} }
return new CommandProcessingResultBuilder().withCommandId(command.commandId()) return new CommandProcessingResultBuilder().withCommandId(command.commandId())