From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 28 Feb 2008 10:44:04 +0000 (+0000)
Subject: fixes #1452
X-Git-Tag: 6.7.0.beta1~5004
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7ff44cf08a05a9090eb02ac30affd217e50e4a69;p=vaadin-framework.git

fixes #1452

svn changeset:3939/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
index 34fb9df5a1..bbe366cbd4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
@@ -103,14 +103,18 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
                             "Submit cancelled (disabled, no file or already submitted)");
             return;
         }
+        // flush possibly pending variable changes, so they will be handled
+        // before upload
+        client.sendPendingVariableChanges();
+
         submitted = true;
         ApplicationConnection.getConsole().log("Submitted form");
 
         disableUpload();
 
         /*
-         * visit server after upload to see possible changes from UploadStarted
-         * event
+         * Visit server a moment after upload has started to see possible
+         * changes from UploadStarted event. Will be cleared on complete.
          */
         t = new Timer() {
             public void run() {