MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-29961 fix NPE

Browse Source
This commit is contained in:
Eugene Kudelevsky
2011-10-05 13:37:22 +04:00
parent f8606af0ac
commit 4c7085dccb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/actions/AndroidProcessChooserDialog.java
+9 -5
View File
@@ -206,7 +206,7 @@ public class AndroidProcessChooserDialog extends DialogWrapper {
}
@NotNull
private static String getPresentableName(IDevice device) {
private static String getPresentableName(@NotNull IDevice device) {
String serialNumber = device.getSerialNumber();
final String avdName = device.getAvdName();
@@ -373,15 +373,19 @@ public class AndroidProcessChooserDialog extends DialogWrapper {
@Override
protected void doOKAction() {
super.doOKAction();
final PropertiesComponent properties = PropertiesComponent.getInstance(myProject);
final IDevice selectedDevice = getSelectedDevice();
assert selectedDevice != null;
if (selectedDevice == null) {
return;
}
final Client selectedClient = getSelectedClient();
assert selectedClient != null;
if (selectedClient == null) {
return;
}
super.doOKAction();
properties.setValue(DEBUGGABLE_DEVICE_PROPERTY, getPresentableName(selectedDevice));
properties.setValue(DEBUGGABLE_PROCESS_PROPERTY, selectedClient.getClientData().getClientDescription());