NPE fix

b060f188 · Serge Rider · 9b9764d3 · b060f188
隐藏空白更改
内联并排

Showing with 5 addition and 3 deletion

plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/ui/views/MySQLCreateDatabaseDialog.java ...dbeaver/ext/mysql/ui/views/MySQLCreateDatabaseDialog.java +5 -3

未找到文件。
--- a/plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/ui/views/MySQLCreateDatabaseDialog.java
+++ b/plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/ui/views/MySQLCreateDatabaseDialog.java
@@ -85,10 +85,12 @@ public class MySQLCreateDatabaseDialog extends BaseDialog
            assert charset != null;

            collationCombo.removeAll();
-            for (MySQLCollation col : charset.getCollations()) {
-                collationCombo.add(col.getName());
+            if (charset != null) {
+                for (MySQLCollation col : charset.getCollations()) {
+                    collationCombo.add(col.getName());
+                }
+                collation = charset.getDefaultCollation();
            }
-            collation = charset.getDefaultCollation();
            if (collation != null) {
                UIUtils.setComboSelection(collationCombo, collation.getName());
            }