diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-09-30 13:33:18 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-09-30 13:33:18 +0000 |
| commit | 108135a586097eb0a8823f3ab59d0c26ce46f7c8 (patch) | |
| tree | 15f3403134dcfcbf3e37896a4e7d7b07a27d564d /src | |
| parent | 3d266de566ee2b4bc8758906c6c487848bea120f (diff) | |
| download | vaadin-framework-108135a586097eb0a8823f3ab59d0c26ce46f7c8.tar.gz vaadin-framework-108135a586097eb0a8823f3ab59d0c26ce46f7c8.zip | |
Another fix for #7692 for JBoss 5+ and possibly other servers/class loaders.
svn changeset:21477/svn branch:6.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 54d2264691..65c902bc10 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1369,9 +1369,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements logger.fine("Accepted access to a JAR entry using a class loader: " + resourceUrl); return true; - } else if ("file".equals(resourceUrl.getProtocol())) { - // Some servers such as GlassFish extract files from JARs. In such - // cases, the class loader sees them as file URLs. + } else { + // Some servers such as GlassFish extract files from JARs (file:) + // and e.g. JBoss 5+ use protocols vsf: and vfsfile: . // Check that the URL is in a VAADIN directory and does not contain // "/../" @@ -1384,10 +1384,6 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements + resourceUrl); return true; } - - // when using the class loader fall-back, other protocols than jar: and - // file: are not supported - return false; } /** |