incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1148808 - /incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
Date Wed, 20 Jul 2011 14:59:35 GMT
Author: marrs
Date: Wed Jul 20 14:59:34 2011
New Revision: 1148808

URL: http://svn.apache.org/viewvc?rev=1148808&view=rev
Log:
ACE-156 fixed resource loading when using ACE with Apache Felix Http Jetty 2.2.0

Modified:
    incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java

Modified: incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java?rev=1148808&r1=1148807&r2=1148808&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
(original)
+++ incubator/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinResourceHandler.java
Wed Jul 20 14:59:34 2011
@@ -54,6 +54,10 @@ public class VaadinResourceHandler {
                 public URL getResource(String name) {
                     URL resource = null;
                     String prefix = "/VAADIN/";
+                    // fix for ACE-156
+                    if (!name.startsWith("/")) {
+                        name = "/" + name;
+                    }
                     if (name.startsWith(prefix)) {
                     	String originalName = name.replace("/ace/", "/reindeer/");
                         resource = getClass().getResource(originalName);



Mime
View raw message