Attachment 141608 Details for Bug 280582 – Test case + bugfix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Test case + bugfix

clipboard.txt (text/plain), 3.37 KB, created by Rüdiger Herrmann

on 2009-07-15 04:38:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-07-15 04:38:37 EDT

Size: 3.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/internal/resources/ResourceManagerImpl.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/resources/ResourceManagerImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 ResourceManagerImpl.java
>--- src/org/eclipse/rwt/internal/resources/ResourceManagerImpl.java	12 Jun 2008 13:12:16 -0000	1.4
>+++ src/org/eclipse/rwt/internal/resources/ResourceManagerImpl.java	15 Jul 2009 08:40:24 -0000
>@@ -364,7 +364,8 @@
>       StringBuffer url = new StringBuffer();
>       url.append( URLHelper.getContextURLString() );
>       url.append( "/" );
>-      url.append( versionedResourceName( newFileName, version ) );
>+      String escapedFilename = escapeFilename( newFileName );
>+      url.append( versionedResourceName( escapedFilename, version ) );
>       result = url.toString();
>     } else {
>       StringBuffer url = new StringBuffer();
>@@ -503,10 +504,17 @@
>     StringBuffer filename = new StringBuffer();
>     filename.append( webAppRoot );
>     filename.append( File.separator );
>-    filename.append( versionedResourceName( name, version ) );
>+    filename.append( versionedResourceName( escapeFilename( name ), version ) );
>     return new File( filename.toString() );
>   }
>   
>+  private static String escapeFilename( final String name ) {
>+    String result = name;
>+    result = name.replaceAll( "\\$", "\\$\\$" );
>+    result = result.replaceAll( ":", "\\$1" );
>+    return result;
>+  }
>+
>   private static File getTempLocation( final String name, 
>                                        final Integer version ) 
>   {
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/rwt/internal/resources/ResourceManagerImpl_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/rwt/internal/resources/ResourceManagerImpl_Test.java,v
>retrieving revision 1.4
>diff -u -r1.4 ResourceManagerImpl_Test.java
>--- src/org/eclipse/rwt/internal/resources/ResourceManagerImpl_Test.java	12 Jun 2008 13:23:17 -0000	1.4
>+++ src/org/eclipse/rwt/internal/resources/ResourceManagerImpl_Test.java	15 Jul 2009 08:40:26 -0000
>@@ -462,9 +462,28 @@
>     content.close();
>     assertNull( manager.getRegisteredContent( "not-there" ) );
>   }
>+  
>+  /*
>+   * 280582: resource registration fails when using ImageDescriptor.createFromURL
>+   * https://bugs.eclipse.org/bugs/show_bug.cgi?id=280582
>+   */
>+  public void testRegisterWithInvalidFilename() throws Exception {
>+    ServiceContext context = new ServiceContext( new TestRequest(),
>+                                                 new TestResponse() );
>+    ContextProvider.setContext( context );
>+    IResourceManager manager = getManager( ResourceBase.DELIVER_FROM_DISK );
>+    InputStream inputStream = openStream( TEST_RESOURCE_2 );
>+    String name = "http://host:port/path$1";
>+    manager.register( name, inputStream );
>+    inputStream.close();
>+    String location = manager.getLocation( name );
>+    assertEquals( "http://TestCase:4711/test/http$1//host$1port/path$$1", 
>+                  location );
>+  }
> 
>-  // ////////////////
>+  ///////////////////
>   // helping methods
>+  
>   private static int[] read( final InputStream input ) throws IOException {
>     int[] result = null;
>     try {

Actions: View | Diff

Attachments on bug 280582: 141608