svn commit: r612099 - /incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java

[fm...@apache.org]

Author: fmeschbe
Date: Tue Jan 15 04:35:49 2008
New Revision: 612099

URL: http://svn.apache.org/viewvc?rev=612099&view=rev
Log:
Ensure servlet init parameters are string values (enforced by Jetty 6)

Modified:
    incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java

Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java?rev=612099&r1=612098&r2=612099&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java Tue Jan 15 04:35:49 2008
@@ -478,8 +478,11 @@
                     return slingAuthenticator.authenticate(request, response);
                 }
             };
+            
+            Dictionary<String, String> servletConfig = toStringConfig(configuration);
+
             this.httpService.registerServlet(this.slingRoot, this,
-                configuration, httpContext);
+                servletConfig, httpContext);
 
             log.info("{} ready to serve requests", this.getServerInfo());
 
@@ -625,4 +628,14 @@
         // global filter by default
         return requestFilterChain;
     }
+    
+    private Dictionary<String, String> toStringConfig(Dictionary<?, ?> config) {
+        Dictionary<String, String> stringConfig = new Hashtable<String, String>();
+        for (Enumeration<?> ke = config.keys(); ke.hasMoreElements();) {
+            Object key = ke.nextElement();
+            stringConfig.put(key.toString(), String.valueOf(config.get(key)));
+        }
+        return stringConfig;
+    }
+
 }