Some bugfixes and added findMessages by sender

2015-09-29 07:13:27 +02:00
parent 7fb837645f
commit c3fdee79ca
4 changed files with 12 additions and 4 deletions
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@ -221,7 +221,8 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
            i++;
        }
        return new Property("network", null,
-                new Property("connectionManager", connectionManager.isAlive() ? "running" : "stopped"),
+                new Property("connectionManager",
+                        connectionManager != null && connectionManager.isAlive() ? "running" : "stopped"),
                new Property("connections", null, streamProperties)
        );
    }