summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-04-02 06:15:13 (EDT)
committerSven Rottstock2013-04-02 06:15:13 (EDT)
commit5bb26bef496729dd2a8c30c41bafaead24643a18 (patch)
treeb86a3a87444a7ddb4440aa4a966f897604c40636
parent1ea709354cfa065c9f661481a307754a2b071105 (diff)
downloadorg.eclipse.stardust.ui.web-5bb26bef496729dd2a8c30c41bafaead24643a18.zip
org.eclipse.stardust.ui.web-5bb26bef496729dd2a8c30c41bafaead24643a18.tar.gz
org.eclipse.stardust.ui.web-5bb26bef496729dd2a8c30c41bafaead24643a18.tar.bz2
Jira-ID: CRNT-28482
Moved closePopup() after callbackHandler.handleEvent at CommonFileUploadDialog.fireCallback git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@64032 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java
index 0bb0198..7fd3ead 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/views/doctree/CommonFileUploadDialog.java
@@ -140,8 +140,6 @@ public class CommonFileUploadDialog extends PopupUIComponentBean
*/
private void fireCallback(FileUploadEvent eventType, FileInfo fileInfo)
{
- closePopup();
-
if (callbackHandler != null)
{
FileWrapper fileWrapper = new FileWrapper();
@@ -158,6 +156,10 @@ public class CommonFileUploadDialog extends PopupUIComponentBean
callbackHandler.handleEvent(eventType);
}
+ // After file upload externalWebapp TO_BE_ACTIVATED failed with no context available
+ // while closePopup, if called before callbachHandler handleEvent , kept closePopup
+ // after event handling
+ closePopup();
}
public int getFileUploadProgress()