| commit | 064d4b059596f98ae6961b163385f5237d42bcb8 | [log] [tgz] |
|---|---|---|
| author | Claudio Guglielmo <claudio.guglielmo@bsiag.com> | Wed Oct 17 07:36:29 2012 +0000 |
| committer | Claudio Guglielmo <claudio.guglielmo@bsiag.com> | Wed Oct 17 07:36:29 2012 +0000 |
| tree | cda2261c1eba92ac406aafb4e2f620a19c6fb71b | |
| parent | 9468286e59067fbe0839d59e6495c9d4dc79cda4 [diff] |
Bug 392137 -Rap: Several NPEs on RwtScoutFileUploadField https://bugs.eclipse.org/bugs/show_bug.cgi?id=392137
diff --git a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java index f139889..0bbda6f 100644 --- a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java +++ b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java
@@ -170,6 +170,10 @@ @Override public void widgetSelected(SelectionEvent event) { String filename = getUiBrowseButton().getFileName(); + if (filename == null) { + return; + } + getUiField().setText(filename); handleUpload(); } @@ -315,6 +319,9 @@ if (!doit) { return; } + if (m_uploadedFile == null) { + return; + } // only handle if text has changed if (CompareUtility.equals(m_uploadedFile, getScoutObject().getDisplayText()) && getScoutObject().getErrorStatus() == null) { return; @@ -365,7 +372,10 @@ if (m_uploadedFile != null) { return false; } - m_handler.removeUploadListener(m_uploadListener); + if (m_uploadListener != null) { + m_handler.removeUploadListener(m_uploadListener); + m_uploadListener = null; + } m_handler.dispose(); getUiBrowseButton().dispose(); getUiProgressBar().dispose();