# HG changeset patch # User dadubrow # Date 1266936597 21600 # Node ID a584c100ba0b9ca5a15ae93a9c9e6834ef32283d # Parent 6a876b480ec4279bc05e16a87c5e5fb76911fb90 fix NPE when connection id is null (found with traceviewer) diff -r 6a876b480ec4 -r a584c100ba0b 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 Mon Feb 22 15:31:58 2010 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Tue Feb 23 08:49:57 2010 -0600 @@ -517,6 +517,8 @@ public ISelectedConnectionInfo ensureConnection(String id, IService service) throws CoreException { Check.checkArg(service); + if (id == null) + return null; final boolean wasCurrentConnection = id.equals(CURRENT_CONNECTION_ID); final IConnection[] connectionHolder = { findConnection(id) }; final String[] storableIdHolder = { id };