Skip to content

Commit 9c2f03c

Browse files
committed
Fix NPE on configuring default MPE contract address
1 parent 2f2dbba commit 9c2f03c

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

sdk/src/main/java/io/singularitynet/sdk/client/JsonConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Address getRegistryAddress() {
6565

6666
@Override
6767
public Address getMultiPartyEscrowAddress() {
68-
return new Address(multiPartyEscrowAddress);
68+
return multiPartyEscrowAddress == null ? null : new Address(multiPartyEscrowAddress);
6969
}
7070

7171
}

sdk/src/test/java/io/singularitynet/sdk/client/JsonConfigurationTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void configureRegistryAddress() {
6363
}
6464

6565
@Test
66-
public void configureNoRegistryAddress() {
66+
public void configureDefaultRegistryAddress() {
6767
String json = "{}";
6868

6969
Configuration config = new JsonConfiguration(json);
@@ -83,4 +83,13 @@ public void configureMultiPartyEscrowAddress() {
8383
assertEquals("MultiPartyEscrow address", new Address(mpeAddress), config.getMultiPartyEscrowAddress());
8484
}
8585

86+
@Test
87+
public void configureDefaultMultiPartyEscrowAddress() {
88+
String json = "{}";
89+
90+
Configuration config = new JsonConfiguration(json);
91+
92+
assertNull("MultiPartyEscrow address", config.getMultiPartyEscrowAddress());
93+
}
94+
8695
}

0 commit comments

Comments
 (0)