NullPointerException in TableQuery.fetchMetadata() (#11403)

Trivial patch. The finally block lacks a check for null before
attempting to invoke table.close()

Change-Id: Ib32f1d75fef4bd442652ca60a2b7df6aa45d7fa7

diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index 39c8365076b05d3d307428b2677c5f495bdbf48a..b54a630e0447eda5df07a2020434ba81f7959d5f 100644 (file)
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
@@ -663,7 +663,9 @@ public class TableQuery extends AbstractTransactionalQuery implements
             } catch (SQLException ignore) {
             } finally {
                 try {
-                    tables.close();
+                    if (tables != null) {
+                        tables.close();
+                    }
                 } catch (SQLException ignore) {
                 }
             }