summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorBuild Agent <build@vaadin.com>2014-03-13 09:19:01 +0200
committerBuild Agent <build@vaadin.com>2014-03-13 09:19:01 +0200
commita382263fc891b6ddc3454e9c616b67be54355668 (patch)
tree19080d088c065d944efb59bc752b974f91bad47a /server
parent1159db580f350493ffcf6628c05924458881ebb2 (diff)
parent94d33ad7c732f620c9e98502b896a65852479b7d (diff)
downloadvaadin-framework-a382263fc891b6ddc3454e9c616b67be54355668.tar.gz
vaadin-framework-a382263fc891b6ddc3454e9c616b67be54355668.zip
Merge changes from origin/7.1
97622fd Added server launch wait to TB2 and TB3 test targets. 94d33ad Class AbstractTransactionalQuery should be public (#12285) Change-Id: Iadb5ac2677399e13cab9212d0a56615cbb2aa674
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
index 3264118732..f36b583e07 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
@@ -31,7 +31,7 @@ import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
* @author Vaadin Ltd
* @since 6.8.9
*/
-abstract class AbstractTransactionalQuery implements Serializable {
+public abstract class AbstractTransactionalQuery implements Serializable {
private JDBCConnectionPool connectionPool;
private transient Connection activeConnection;