# HG changeset patch # User dadubrow # Date 1248893103 18000 # Node ID 6a8fd4465a9b2200cdd3e78208983b069a1d84d0 # Parent 9a15cc2691b54a75caff77e9d57f5f44ff613223 [Bug 9514] Fix NPE diff -r 9a15cc2691b5 -r 6a8fd4465a9b connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Tue Jul 28 15:08:51 2009 -0500 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Wed Jul 29 13:45:03 2009 -0500 @@ -407,7 +407,11 @@ } public Collection getConnectedServices(IConnection connection) { - return new ArrayList(connectionToConnectedServices.get(connection)); + List connectedServices = connectionToConnectedServices.get(connection); + if (connectedServices != null) + return new ArrayList(connectedServices); + + return null; } private File getConnectionStorageFile() {