#9911 Add null check

Former-commit-id: c437db9f

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreRestoreWizardPageSettings.java

@@ -84,7 +84,7 @@ class PostgreRestoreWizardPageSettings extends PostgreToolWizardPageSettings<Pos
         inputFileText = new TextWithOpenFile(inputGroup, PostgreMessages.wizard_restore_page_setting_label_choose_backup_file, new String[] {"*.backup","*.sql","*"});
         inputFileText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
         inputFileText.getTextControl().addListener(SWT.Modify, updateListener);
-        //inputFileText.setText(wizard.getSettings().getInputFile());
+        inputFileText.setText(wizard.getSettings().getInputFile());
 
         createExtraArgsInput(inputGroup);
 

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tasks/PostgreDatabaseRestoreSettings.java

@@ -110,7 +110,9 @@ public class PostgreDatabaseRestoreSettings extends PostgreBackupRestoreSettings
         store.setValue("pg.restore.inputFile", inputFile);
         store.setValue("pg.restore.cleanFirst", cleanFirst);
         store.setValue("pg.restore.noOwner", noOwner);
-        store.setValue("pg.restore.database", DBUtils.getObjectFullId(restoreInfo.getDatabase()));
+        if (restoreInfo != null) {
+            store.setValue("pg.restore.database", DBUtils.getObjectFullId(restoreInfo.getDatabase()));
+        }
     }
 
 }