Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-07-30 19:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

KeyChainGroup: Fix NullPointerException in findRedeemDataFromScriptHash() if no deterministic keychain is in the group.

Browse Source
This commit is contained in:
Andreas Schildbach
2019-03-19 18:01:18 +01:00
parent c3b6e0d7b9
commit c7dfe59317
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
View File

@@ -502,12 +502,14 @@ public class KeyChainGroup implements KeyBag {
@Override @Override
@Nullable @Nullable
public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) { public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) {
// Iterate in reverse order, since the active keychain is the one most likely to have the hit if (chains != null) {
for (Iterator<DeterministicKeyChain> iter = chains.descendingIterator() ; iter.hasNext() ; ) { // Iterate in reverse order, since the active keychain is the one most likely to have the hit
DeterministicKeyChain chain = iter.next(); for (Iterator<DeterministicKeyChain> iter = chains.descendingIterator(); iter.hasNext();) {
RedeemData redeemData = chain.findRedeemDataByScriptHash(ByteString.copyFrom(scriptHash)); DeterministicKeyChain chain = iter.next();
if (redeemData != null) RedeemData redeemData = chain.findRedeemDataByScriptHash(ByteString.copyFrom(scriptHash));
return redeemData; if (redeemData != null)
return redeemData;
}
} }
return null; return null;
} }