Browse Source

修改账本提交异常

tags/1.1.0
shaozhuguang 5 years ago
parent
commit
3deb0effb3
2 changed files with 7 additions and 7 deletions
  1. +2
    -2
      source/gateway/src/main/java/com/jd/blockchain/gateway/web/BlockBrowserController.java
  2. +5
    -5
      source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionEngineImpl.java

+ 2
- 2
source/gateway/src/main/java/com/jd/blockchain/gateway/web/BlockBrowserController.java View File

@@ -70,13 +70,13 @@ public class BlockBrowserController implements BlockchainExtendQueryService {
@RequestMapping(method = RequestMethod.GET, path = "ledgers/{ledgerHash}/admininfo") @RequestMapping(method = RequestMethod.GET, path = "ledgers/{ledgerHash}/admininfo")
@Override @Override
public LedgerAdminInfo getLedgerAdminInfo(HashDigest ledgerHash) {
public LedgerAdminInfo getLedgerAdminInfo(@PathVariable(name = "ledgerHash") HashDigest ledgerHash) {
return peerService.getQueryService().getLedgerAdminInfo(ledgerHash); return peerService.getQueryService().getLedgerAdminInfo(ledgerHash);
} }


@RequestMapping(method = RequestMethod.GET, path = "ledgers/{ledgerHash}/participants") @RequestMapping(method = RequestMethod.GET, path = "ledgers/{ledgerHash}/participants")
@Override @Override
public ParticipantNode[] getConsensusParticipants(HashDigest ledgerHash) {
public ParticipantNode[] getConsensusParticipants(@PathVariable(name = "ledgerHash") HashDigest ledgerHash) {
return peerService.getQueryService().getConsensusParticipants(ledgerHash); return peerService.getQueryService().getConsensusParticipants(ledgerHash);
} }




+ 5
- 5
source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionEngineImpl.java View File

@@ -54,31 +54,31 @@ public class TransactionEngineImpl implements TransactionEngine {


private class InnerTransactionBatchProcessor extends TransactionBatchProcessor { private class InnerTransactionBatchProcessor extends TransactionBatchProcessor {


private HashDigest ledgerHash;
// private HashDigest ledgerHash;


/** /**
* 创建交易批处理器; * 创建交易批处理器;
* *
* @param ledgerRepo 账本; * @param ledgerRepo 账本;
* @param handlesRegisteration 操作处理对象注册表; * @param handlesRegisteration 操作处理对象注册表;
* @param blockHeight
*
*/ */
public InnerTransactionBatchProcessor(LedgerRepository ledgerRepo, public InnerTransactionBatchProcessor(LedgerRepository ledgerRepo,
OperationHandleRegisteration handlesRegisteration) { OperationHandleRegisteration handlesRegisteration) {
super(ledgerRepo, handlesRegisteration); super(ledgerRepo, handlesRegisteration);
ledgerHash = ledgerRepo.getHash();
// ledgerHash = ledgerRepo.getHash();
} }


@Override @Override
protected void onCommitted() { protected void onCommitted() {
super.onCommitted(); super.onCommitted();
finishBatch(ledgerHash);
finishBatch(getLedgerHash());
} }


@Override @Override
protected void onCanceled() { protected void onCanceled() {
super.onCanceled(); super.onCanceled();
finishBatch(ledgerHash);
finishBatch(getLedgerHash());
} }


} }


Loading…
Cancel
Save