From 7e278d4af37a45fda84cbda917418dcd6d8e08e6 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 6 Feb 2013 12:26:45 +0200
Subject: Set the first cause as the cause of CacheUpdateException (#10951)

Change-Id: Icadfd46919c14fccfa1531b6f2b3e245dea3b111
---
 server/src/com/vaadin/ui/Table.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'server/src/com/vaadin/ui')

diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index 940001fb51..a9632da038 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -1660,7 +1660,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
             exceptionsDuringCachePopulation.clear();
             throw new CacheUpdateException(this,
-                    "Error during Table cache update", causes);
+                    "Error during Table cache update.", causes);
         }
 
     }
@@ -1669,7 +1669,9 @@ public class Table extends AbstractSelect implements Action.Container,
      * Exception thrown when one or more exceptions occurred during updating of
      * the Table cache.
      * <p>
-     * Contains all exceptions which occurred during the cache update.
+     * Contains all exceptions which occurred during the cache update. The first
+     * occurred exception is set as the cause of this exception. All occurred
+     * exceptions can be accessed using {@link #getCauses()}.
      * </p>
      * 
      */
@@ -1679,11 +1681,20 @@ public class Table extends AbstractSelect implements Action.Container,
 
         public CacheUpdateException(Table table, String message,
                 Throwable[] causes) {
-            super(message);
+            super(maybeSupplementMessage(message, causes.length), causes[0]);
             this.table = table;
             this.causes = causes;
         }
 
+        private static String maybeSupplementMessage(String message,
+                int causeCount) {
+            if (causeCount > 1) {
+                return message + " Additional causes not shown.";
+            } else {
+                return message;
+            }
+        }
+
         /**
          * Returns the cause(s) for this exception
          * 
-- 
cgit v1.2.3