diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-10-02 06:24:26 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-02 06:24:26 +0000 |
| commit | 233be6f0e57c5a991e4d8587ce13d7010377d2a9 (patch) | |
| tree | 46dba74f385e93e03b8a550434b498fdc99236e4 /server/src/com | |
| parent | f023100342b7245c97984129d1ad5a56e848f1e8 (diff) | |
| parent | def50dcdd7f28f9f4f92fb723191049f67fd21e4 (diff) | |
| download | vaadin-framework-233be6f0e57c5a991e4d8587ce13d7010377d2a9.tar.gz vaadin-framework-233be6f0e57c5a991e4d8587ce13d7010377d2a9.zip | |
Merge changes Iae2ac641,I50a0ac7a
* changes:
Made GlobalResourceHandler serializable (#9817)
Updated GAE test to be UI based (#9816)
Diffstat (limited to 'server/src/com')
| -rw-r--r-- | server/src/com/vaadin/server/GlobalResourceHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/GlobalResourceHandler.java b/server/src/com/vaadin/server/GlobalResourceHandler.java index c968dba066..ad276dc77a 100644 --- a/server/src/com/vaadin/server/GlobalResourceHandler.java +++ b/server/src/com/vaadin/server/GlobalResourceHandler.java @@ -59,7 +59,7 @@ public class GlobalResourceHandler implements RequestHandler { private int nextLegacyId = 0; // APP/global/[uiid]/[type]/[id] - private final Matcher matcher = Pattern.compile( + private static final Matcher matcher = Pattern.compile( "^/?" + ApplicationConstants.APP_REQUEST_PATH + RESOURCE_REQUEST_PATH + "(\\d+)/(([^/]+)(/.*))").matcher( ""); |