diff options
| author | Artur Signell <artur@vaadin.com> | 2015-05-18 21:39:06 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-05-19 14:18:49 +0000 |
| commit | a42fe556c27397c606183864909c9dd0e012d35a (patch) | |
| tree | 19e7d9fb1e707f4971a840f75c70b32ff2609511 /server/src/com/vaadin/data | |
| parent | 8bafe0f91947c9f33b2d22c1595a17fb016bef8e (diff) | |
| download | vaadin-framework-a42fe556c27397c606183864909c9dd0e012d35a.tar.gz vaadin-framework-a42fe556c27397c606183864909c9dd0e012d35a.zip | |
Handle generated empty string style names properly (#17335)
Change-Id: I1adce18f238fd4357b0eb1be68ebf7a3aaa6dd6e
Diffstat (limited to 'server/src/com/vaadin/data')
| -rw-r--r-- | server/src/com/vaadin/data/RpcDataProviderExtension.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java index cc1fbcf5e3..9d18736ba8 100644 --- a/server/src/com/vaadin/data/RpcDataProviderExtension.java +++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java @@ -1134,7 +1134,7 @@ public class RpcDataProviderExtension extends AbstractExtension { Object propertyId = column.getPropertyId(); cellReference.set(propertyId); String style = generator.getStyle(cellReference); - if (style != null) { + if (style != null && !style.isEmpty()) { if (cellStyles == null) { cellStyles = Json.createObject(); } @@ -1152,7 +1152,7 @@ public class RpcDataProviderExtension extends AbstractExtension { private void setGeneratedRowStyles(RowStyleGenerator generator, JsonObject rowObject) { String rowStyle = generator.getStyle(rowReference); - if (rowStyle != null) { + if (rowStyle != null && !rowStyle.isEmpty()) { rowObject.put(GridState.JSONKEY_ROWSTYLE, rowStyle); } } |