[freenet-cvs] r8618 - trunk/freenet/src/freenet/clients/http

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-05-06 10:14:21 +0000 (Sat, 06 May 2006)
New Revision: 8618

Modified:
   trunk/freenet/src/freenet/clients/http/PageMaker.java
Log:
Fix a NPE occuring when there is a special caracter within the path : ' ' for 
instance was coded %20

Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-06 
09:01:49 UTC (rev 8617)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java       2006-05-06 
10:14:21 UTC (rev 8618)
@@ -12,6 +12,9 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;

+import freenet.support.URLDecoder;
+import freenet.support.URLEncodedFormatException;
+
 import sun.net.www.protocol.file.FileURLConnection;

 /** Simple class to output standard heads and tail for web interface pages. 
@@ -93,11 +96,18 @@
                }
                List themes = new ArrayList();
                try {
-                       URL url = getClass().getResource("staticfiles/themes/");
+                       URL url = 
getClass().getResource("staticfiles/themes/");                        
                        URLConnection urlConnection = url.openConnection();
                        if (urlConnection instanceof FileURLConnection) {
                                FileURLConnection fileUrlConnection = 
(FileURLConnection) urlConnection;
-                               File themesDirectory = new 
File(fileUrlConnection.getURL().getPath());
+                               String decodedURL = 
fileUrlConnection.getURL().getPath();
+                               
+                               try{
+                                       decodedURL = 
URLDecoder.decode(url.getPath().replace('/',File.separatorChar).replace('|',':'));
+                               }catch (URLEncodedFormatException e){
+                               }
+                               
+                               File themesDirectory = new File(decodedURL);
                                File[] themeDirectories = 
themesDirectory.listFiles();
                                for (int themeIndex = 0; themeIndex < 
themeDirectories.length; themeIndex++) {
                                        File themeDirectory = 
themeDirectories[themeIndex];