diff options
| author | Leif Åstrand <leif@vaadin.com> | 2015-03-23 08:20:23 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2015-03-23 08:20:23 +0200 |
| commit | 20d5456c3d5fb825783d7311ebd797c9ae8690f9 (patch) | |
| tree | 9401f94b7d84209bdc991c15995512c56e50d03f /server/src/com/vaadin/ui/declarative/converters | |
| parent | 16c67cfab9b3dd2dbf324caa612fa3a2d15550d0 (diff) | |
| parent | 04272699b8f429a2bc3b8f0a41e20a604213895e (diff) | |
| download | vaadin-framework-20d5456c3d5fb825783d7311ebd797c9ae8690f9.tar.gz vaadin-framework-20d5456c3d5fb825783d7311ebd797c9ae8690f9.zip | |
Merge remote-tracking branch 'origin/master' into grid-7.5
Change-Id: I53218c269f0701cddd8279bf25c493950144f4cb
Diffstat (limited to 'server/src/com/vaadin/ui/declarative/converters')
| -rw-r--r-- | server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java index d80119bea1..0c6cf55bed 100644 --- a/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java +++ b/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java @@ -64,7 +64,8 @@ public class DesignToStringConverter<TYPE> implements Converter<String, TYPE> { * must be public and static method that returns an object of * passed type. */ - public DesignToStringConverter(Class<? extends TYPE> type, String staticMethodName) { + public DesignToStringConverter(Class<? extends TYPE> type, + String staticMethodName) { this.type = type; this.staticMethodName = staticMethodName; } @@ -81,7 +82,7 @@ public class DesignToStringConverter<TYPE> implements Converter<String, TYPE> { } catch (IllegalArgumentException e) { throw new Converter.ConversionException(e); } catch (InvocationTargetException e) { - throw new Converter.ConversionException(e); + throw new Converter.ConversionException(e.getCause()); } catch (NoSuchMethodException e) { throw new Converter.ConversionException(e); } catch (SecurityException e) { |