diff options
Diffstat (limited to 'src/com/vaadin/ui/Table.java')
| -rw-r--r-- | src/com/vaadin/ui/Table.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index 574704d3bf..8bd40f944d 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -3467,10 +3467,12 @@ public class Table extends AbstractSelect implements Action.Container, if (hasConverter(colId)) { converter = getConverter(colId); } else { - // FIXME: Use thread local - converter = (Converter<Object, String>) Application - .getConverterFactory().createConverter(property.getType(), - String.class); + Application app = Application.getCurrentApplication(); + if (app != null) { + converter = (Converter<Object, String>) app + .getConverterFactory().createConverter( + property.getType(), String.class); + } } Object value = property.getValue(); if (converter != null) { |