diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-03-13 07:31:32 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-03-13 07:31:32 +0000 |
| commit | e623a34cd452d2e9494317ffd9f4a0159e733ad6 (patch) | |
| tree | c3774ccfb146172853bbfad609c4fe2273d91377 | |
| parent | ece1bb4b6f9e529a398d8a769772fbea745afae2 (diff) | |
| parent | a382263fc891b6ddc3454e9c616b67be54355668 (diff) | |
| download | vaadin-framework-e623a34cd452d2e9494317ffd9f4a0159e733ad6.tar.gz vaadin-framework-e623a34cd452d2e9494317ffd9f4a0159e733ad6.zip | |
Merge "Merge changes from origin/7.1"
| -rw-r--r-- | server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java | 2 | ||||
| -rw-r--r-- | uitest/build.xml | 2 |
2 files changed, 3 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; diff --git a/uitest/build.xml b/uitest/build.xml index b9bb5a4cbd..8479063ba0 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -212,6 +212,7 @@ <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> </daemons> <sequential> + <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" /> <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" /> </sequential> </parallel> @@ -224,6 +225,7 @@ <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> </daemons> <sequential> + <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" /> <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" /> </sequential> </parallel> |