You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2008/03/28 12:02:18 UTC

svn commit: r642195 - /mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java

Author: jvermillard
Date: Fri Mar 28 04:02:06 2008
New Revision: 642195

URL: http://svn.apache.org/viewvc?rev=642195&view=rev
Log:
fixing classloader issues with OSGi, related to loading of ressource bundles (for i18n)

Modified:
    mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java

Modified: mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java?rev=642195&r1=642194&r2=642195&view=diff
==============================================================================
--- mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java (original)
+++ mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java Fri Mar 28 04:02:06 2008
@@ -23,9 +23,9 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
+import java.util.ResourceBundle;
 import org.apache.asyncweb.fileservice.mimetype.MimeMap;
 import org.apache.asyncweb.server.errorReporting.CSS;
-import org.apache.asyncweb.server.util.StringBundle;
 import org.apache.mina.common.IoBuffer;
 
 /**
@@ -34,11 +34,15 @@
  */
 public class DefaultDirectoryIndexGenerator implements DirectoryIndexGenerator {
 
-    private static final StringBundle bundle = StringBundle
-            .getBundle(DefaultDirectoryIndexGenerator.class.getPackage()
-                    .getName());
+    private static ResourceBundle bundle;
 
     public IoBuffer generateIndex(File directory) {
+        if (bundle == null) {
+            
+            bundle = ResourceBundle.getBundle(DefaultDirectoryIndexGenerator.class.getPackage()
+                    .getName()+".strings");
+        }
+            
         File[] files = directory.listFiles();
 
         StringBuilder html = new StringBuilder(1024);