Merged in rog-additional-compiler-warning-fixes (pull request #502)

Fixed an additional 2 compiler warnings.
This commit is contained in:
Roger Willis 2016-11-21 11:07:03 +00:00
commit 31dd93523b
2 changed files with 2 additions and 1 deletions

View File

@ -129,6 +129,7 @@ public class Base58 {
* *
* @param input the base58-encoded string to decode (which should include the checksum) * @param input the base58-encoded string to decode (which should include the checksum)
* @throws AddressFormatException if the input is not base 58 or the checksum does not validate. * @throws AddressFormatException if the input is not base 58 or the checksum does not validate.
* @return the original data bytes less the last 4 bytes (the checksum).
*/ */
public static byte[] decodeChecked(String input) throws AddressFormatException { public static byte[] decodeChecked(String input) throws AddressFormatException {
byte[] decoded = decode(input); byte[] decoded = decode(input);

View File

@ -147,7 +147,7 @@ inline fun <reified P : ProtocolLogic<*>> AbstractNode.initiateSingleShotProtoco
val subscriber = object : Subscriber<Change>() { val subscriber = object : Subscriber<Change>() {
override fun onNext(change: Change) { override fun onNext(change: Change) {
if (change.logic is P && change.addOrRemove == ADD) { if (change.addOrRemove == ADD) {
unsubscribe() unsubscribe()
future.set(change.logic as P) future.set(change.logic as P)
} }