diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-11 05:57:13 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-11 05:57:13 +0000 |
| commit | 52571945b840d78181114ad728bedf50c4a5aaa6 (patch) | |
| tree | 85a6b9c283c7a51e243fd19e256ec80ce6ecfaef | |
| parent | 096f58eb7886466fdfee5c56218a6e30cf6ad93c (diff) | |
| parent | d6e4157a195f05aaa4f5b627c5a5b1d05c9f7899 (diff) | |
| download | vaadin-framework-52571945b840d78181114ad728bedf50c4a5aaa6.tar.gz vaadin-framework-52571945b840d78181114ad728bedf50c4a5aaa6.zip | |
Merged changes from 6.6
svn changeset:20279/svn branch:6.7
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rwxr-xr-x | src/com/vaadin/terminal/gwt/client/ApplicationConnection.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index fffa906ec1..c62f64796d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -991,7 +991,7 @@ </tstamp> <property file="${build.properties.file}" /> <property name="version" value="${vaadin.version}"/> - <property name="version.full" value="${version}.custom-${build.date.compact}"/> + <property name="version.full" value="${version}-${build.date.compact}"/> <!-- <property name="compile.only.default-widgetset" value="1"/> --> </then> <!-- Otherwise version and snapshot.repository.url come from target "init" --> diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index d320e463cb..8baad19786 100755 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -570,7 +570,7 @@ public class ApplicationConnection { } int cssWaits = 0; - static final int MAX_CSS_WAITS = 20; + static final int MAX_CSS_WAITS = 100; protected void handleWhenCSSLoaded(final String jsonText, final ValueMap json) { diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java index fac1f17ba7..49d40cbc62 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java @@ -29,7 +29,7 @@ import com.vaadin.Application; public class PortletApplicationContext extends WebApplicationContext implements Serializable { - protected PortletSession portletSession; + protected transient PortletSession portletSession; protected Map<Application, Set<PortletListener>> portletListeners = new HashMap<Application, Set<PortletListener>>(); |