Merge "[FAB-15717] fix Error Unexpected end of JSON input"

hyperledger · Jul 15, 2019 · 7a5f339 · 7a5f339
2 parents e8c0ca1 + 6ae711c
commit 7a5f339
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/commercial-paper/organization/digibank/contract/ledger-api/statelist.js b/commercial-paper/organization/digibank/contract/ledger-api/statelist.js
@@ -42,8 +42,12 @@ class StateList {
  async getState(key) {
  let ledgerKey = this.ctx.stub.createCompositeKey(this.name, State.splitKey(key));
  let data = await this.ctx.stub.getState(ledgerKey);
- let state = State.deserialize(data, this.supportedClasses);
- return state;
+ if (data && data.toString('utf8')) {
+ let state = State.deserialize(data, this.supportedClasses);
+ return state;
+ } else {
+ return null;
+ }
  }
 
  /**

diff --git a/commercial-paper/organization/magnetocorp/contract/ledger-api/statelist.js b/commercial-paper/organization/magnetocorp/contract/ledger-api/statelist.js
@@ -42,8 +42,12 @@ class StateList {
  async getState(key) {
  let ledgerKey = this.ctx.stub.createCompositeKey(this.name, State.splitKey(key));
  let data = await this.ctx.stub.getState(ledgerKey);
- let state = State.deserialize(data, this.supportedClasses);
- return state;
+ if (data && data.toString('utf8')) {
+ let state = State.deserialize(data, this.supportedClasses);
+ return state;
+ } else {
+ return null;
+ }
  }
 
  /**