more on IDEA-126591 Android Support NPE (IDEA-CR-336)

1 files changed, 2 insertions, 2 deletions

diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
index 4a1207f9468..d762a247dba 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
@@ -7,6 +7,7 @@ import com.android.ddmlib.MultiLineReceiver;
 import com.android.tools.idea.ddms.DeviceComboBoxRenderer;
 import com.intellij.database.dataSource.AbstractDataSourceConfigurable;
 import com.intellij.database.dataSource.DatabaseDriver;
+import com.intellij.database.util.DbImplUtil;
 import com.intellij.facet.ProjectFacetManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
@@ -357,8 +358,7 @@ public class AndroidDataSourcePropertiesDialog extends AbstractDataSourceConfigu
   public void apply() {
     saveData(myDataSource);
 
-    boolean canConnect = StringUtil.isNotEmpty(myDataSource.getState().getDeviceId());
-    if (canConnect) {
+    if (DbImplUtil.canConnectTo(myDataSource)) {
       AndroidSynchronizeHandler.doSynchronize(myProject, Collections.singletonList(myDataSource));
     }