You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2017/01/13 08:48:46 UTC
[1/2] incubator-fineract git commit: addressModuleFix
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 4fb7794a4 -> 749266d40
addressModuleFix
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/b8d8c452
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/b8d8c452
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/b8d8c452
Branch: refs/heads/develop
Commit: b8d8c452cc920d6c08d7c2a4cebfe785d0e91423
Parents: 9a6b5d1
Author: nikpawar89 <ni...@yahoo.in>
Authored: Mon Jan 2 17:54:47 2017 -0500
Committer: nikpawar89 <ni...@yahoo.in>
Committed: Mon Jan 2 17:54:47 2017 -0500
----------------------------------------------------------------------
.../address/service/AddressWritePlatformServiceImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/b8d8c452/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressWritePlatformServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressWritePlatformServiceImpl.java
index c15b950..3f62d40 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressWritePlatformServiceImpl.java
@@ -142,7 +142,13 @@ public class AddressWritePlatformServiceImpl implements AddressWritePlatformServ
final Long addressid = add.getId();
final Address addobj = this.addressRepository.getOne(addressid);
- final boolean isActive = jsonObject.get("isActive").getAsBoolean();
+ //final boolean isActive = jsonObject.get("isActive").getAsBoolean();
+ boolean isActive=false;
+ if(jsonObject.get("isActive")!= null)
+ {
+ isActive= jsonObject.get("isActive").getAsBoolean();
+ }
+
clientAddressobj = ClientAddress.fromJson(isActive, client, addobj, addressTypeIdObj);
this.clientAddressRepository.save(clientAddressobj);
[2/2] incubator-fineract git commit: Merge branch 'Fineract-265' into
develop
Posted by na...@apache.org.
Merge branch 'Fineract-265' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/749266d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/749266d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/749266d4
Branch: refs/heads/develop
Commit: 749266d4081384a3e47d3a9247cdfb09ed468e7a
Parents: 4fb7794 b8d8c45
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Fri Jan 13 14:18:01 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Fri Jan 13 14:18:01 2017 +0530
----------------------------------------------------------------------
.../address/service/AddressWritePlatformServiceImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------