[Osgi-messages] SF.net SVN: osgi:[258] papoose-cmpn/trunk/http/src/main/java/org/papoose/ http

[<osg...@li...>]

Revision: 258
          http://osgi.svn.sourceforge.net/osgi/?rev=258&view=rev
Author:   maguro
Date:     2010-02-25 20:22:55 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
Need AccessControlContext for URL handling context

Modified Paths:
--------------
    papoose-cmpn/trunk/http/src/main/java/org/papoose/http/HttpServiceImpl.java
    papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletWrapper.java

Modified: papoose-cmpn/trunk/http/src/main/java/org/papoose/http/HttpServiceImpl.java
===================================================================
--- papoose-cmpn/trunk/http/src/main/java/org/papoose/http/HttpServiceImpl.java	2010-02-25 03:17:24 UTC (rev 257)
+++ papoose-cmpn/trunk/http/src/main/java/org/papoose/http/HttpServiceImpl.java	2010-02-25 20:22:55 UTC (rev 258)
@@ -22,6 +22,8 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
+import java.security.AccessControlContext;
+import java.security.AccessController;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
@@ -118,7 +120,7 @@
 
         try
         {
-            registerServlet(alias, new ServletWrapper(alias, name, httpContext), EMPTY_PARAMS, httpContext);
+            registerServlet(alias, new ServletWrapper(alias, name, httpContext, AccessController.getContext()), EMPTY_PARAMS, httpContext);
         }
         catch (ServletException se)
         {

Modified: papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletWrapper.java
===================================================================
--- papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletWrapper.java	2010-02-25 03:17:24 UTC (rev 257)
+++ papoose-cmpn/trunk/http/src/main/java/org/papoose/http/ServletWrapper.java	2010-02-25 20:22:55 UTC (rev 258)
@@ -21,6 +21,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.security.AccessControlContext;
 import java.util.logging.Logger;
 
 import org.osgi.service.http.HttpContext;
@@ -29,19 +30,21 @@
 /**
  * @version $Revision: $ $Date: $
  */
- class ServletWrapper extends HttpServlet
+class ServletWrapper extends HttpServlet
 {
     private final static String CLASS_NAME = ServletWrapper.class.getName();
     private final static Logger LOGGER = Logger.getLogger(CLASS_NAME);
     private final String alias;
     private final String name;
     private final HttpContext httpContext;
+    private final AccessControlContext acc;
 
-     ServletWrapper(String alias, String name, HttpContext httpContext)
+    ServletWrapper(String alias, String name, HttpContext httpContext, AccessControlContext acc)
     {
         this.alias = alias;
         this.name = name;
         this.httpContext = httpContext;
+        this.acc = acc;
     }
 
     @Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.