aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2009-07-03 12:37:39 +0000
committerMarc Englund <marc.englund@itmill.com>2009-07-03 12:37:39 +0000
commit286d2d80873b315205057205735b74463641f5d0 (patch)
treef18b96ebe8cf0c15e210a52c86a6c88574dff9de /src
parentedf8b5dea283c9b79a6e88b3d7580c80649b2af0 (diff)
downloadvaadin-framework-286d2d80873b315205057205735b74463641f5d0.tar.gz
vaadin-framework-286d2d80873b315205057205735b74463641f5d0.zip
Upload progress listeners called when appropriate, fixes #3102
svn changeset:8315/svn branch:6.0
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/ui/Upload.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/Upload.java b/src/com/vaadin/ui/Upload.java
index 238217a4c2..70e16e1ded 100644
--- a/src/com/vaadin/ui/Upload.java
+++ b/src/com/vaadin/ui/Upload.java
@@ -161,7 +161,8 @@ public class Upload extends AbstractComponent implements Component.Focusable {
while ((bytesRead = in.read(buffer)) > 0) {
out.write(buffer, 0, bytesRead);
totalBytes += bytesRead;
- if (progressListener != null && contentLength > 0) {
+ if (contentLength > 0
+ && (progressListeners != null || progressListener != null)) {
// update progress if listener set and contentLength
// received
synchronized (application) {