connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java
equal
deleted
inserted
replaced
540 public void disconnect(final IConnection2 connection) { |
540 public void disconnect(final IConnection2 connection) { |
541 if (!connection.isDynamic()) |
541 if (!connection.isDynamic()) |
542 return; |
542 return; |
543 |
543 |
544 // transition to disconnected state and wait: |
544 // transition to disconnected state and wait: |
545 // if not in-use, remove and stop waiting |
545 // when not in-use, remove and stop waiting |
546 // if reconnected, stop waiting |
|
547 if (connection.getStatus().getEConnectionStatus().equals(EConnectionStatus.IN_USE)) { |
546 if (connection.getStatus().getEConnectionStatus().equals(EConnectionStatus.IN_USE)) { |
548 IConnectionStatus status = new ConnectionStatus(EConnectionStatus.IN_USE_DISCONNECTED, |
547 IConnectionStatus status = new ConnectionStatus(EConnectionStatus.IN_USE_DISCONNECTED, |
549 "connection has been disconnected while in use, please reconnect"); |
548 "connection has been disconnected while in use, please reconnect"); |
550 connection.setStatus(status); |
549 connection.setStatus(status); |
551 IConnectionStatusChangedListener listener = new IConnectionStatusChangedListener() { |
550 IConnectionStatusChangedListener listener = new IConnectionStatusChangedListener() { |
564 !eStatus.equals(EConnectionStatus.IN_USE_DISCONNECTED); |
563 !eStatus.equals(EConnectionStatus.IN_USE_DISCONNECTED); |
565 } |
564 } |
566 }; |
565 }; |
567 connectionListenerMap.put(connection, listener); |
566 connectionListenerMap.put(connection, listener); |
568 connection.addStatusChangedListener(listener); |
567 connection.addStatusChangedListener(listener); |
|
568 } |
|
569 else { |
|
570 removeConnection(connection); |
569 } |
571 } |
570 } |
572 } |
571 |
573 |
572 public boolean reconnect(IConnection2 connection) { |
574 public boolean reconnect(IConnection2 connection) { |
573 if (!connection.isDynamic()) |
575 if (!connection.isDynamic()) |