bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed system test and added some fixes for Java backwards compatibility

Browse Source
This commit is contained in:
Christian Basler
2017-06-27 17:22:48 +02:00
parent 322bddcc4f
commit aee5debdd2
21 changed files with 89 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
networking/src/main/kotlin/ch/dissem/bitmessage/networking/nio/Connection.kt
View File

@ -75,7 +75,7 @@ class Connection(
fun send(payload: MessagePayload) = io.send(payload)
protected fun handleMessage(payload: MessagePayload) {
private fun handleMessage(payload: MessagePayload) {
when (state) {
State.CONNECTING -> initializer!!.handleCommand(payload)
State.ACTIVE -> receiveMessage(payload)
@ -108,7 +108,7 @@ class Connection(
private fun receiveMessage(objectMessage: ObjectMessage) {
requestedObjects.remove(objectMessage.inventoryVector)
if (ctx.inventory.contains(objectMessage)) {
LOG.trace("Received object " + objectMessage.inventoryVector + " - already in inventory")
LOG.trace("Received object ${objectMessage.inventoryVector} - already in inventory")
return
}
try {
@ -122,7 +122,7 @@ class Connection(
LOG.warn(e.message)
// DebugUtils.saveToFile(objectMessage); // this line must not be committed active
} catch (e: IOException) {
LOG.error("Stream " + objectMessage.stream + ", object type " + objectMessage.type + ": " + e.message, e)
LOG.error("Stream ${objectMessage.stream}, object type ${objectMessage.type}: ${e.message}", e)
} finally {
if (commonRequestedObjects.remove(objectMessage.inventoryVector) == null) {
LOG.debug("Received object that wasn't requested.")
@ -131,7 +131,7 @@ class Connection(
}
private fun receiveMessage(addr: Addr) {
LOG.trace("Received " + addr.addresses.size + " addresses.")
LOG.trace("Received ${addr.addresses.size} addresses.")
ctx.nodeRegistry.offerAddresses(addr.addresses)
}

2
networking/src/main/kotlin/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.kt
View File

@ -431,7 +431,7 @@ class NioNetworkHandler : NetworkHandler, InternalContext.ContextHolder {
}
return Property("network",
Property("connectionManager", if (isRunning) "running" else "stopped"),
Property("connections", *streamProperties.toTypedArray()),
Property("connections", streamProperties),
Property("requestedObjects", requestedObjects.size)
)
}