Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Kaegi2007-03-15 15:07:43 +0000
committerSimon Kaegi2007-03-15 15:07:43 +0000
commit027cd4c11b70e2b671ca5025c32a1fb6de83d0ab (patch)
treeaaa5d14e66b972022d8811ba1be553cefdad1e2b /bundles/org.eclipse.equinox.http.registry
parentb607e220747dbfbf302aa6e4a5e2f92403b038f4 (diff)
downloadrt.equinox.bundles-027cd4c11b70e2b671ca5025c32a1fb6de83d0ab.tar.gz
rt.equinox.bundles-027cd4c11b70e2b671ca5025c32a1fb6de83d0ab.tar.xz
rt.equinox.bundles-027cd4c11b70e2b671ca5025c32a1fb6de83d0ab.zip
Unlogged - HttpContext needs to track on the defining ConfigurationElements instead of Extensions since one extension can contain multiple HttpContexts
Diffstat (limited to 'bundles/org.eclipse.equinox.http.registry')
-rw-r--r--bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpContextManager.java4
-rw-r--r--bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/NamedHttpContextImpl.java10
2 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpContextManager.java b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpContextManager.java
index 24eef2a45..c2b86e38e 100644
--- a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpContextManager.java
+++ b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpContextManager.java
@@ -120,7 +120,7 @@ public class HttpContextManager implements Listener {
}
NamedHttpContextImpl namedContext = (NamedHttpContextImpl) getHttpContext(httpContextName);
- namedContext.addHttpContext(extension, context);
+ namedContext.addHttpContext(httpContextElement, context);
}
}
@@ -135,7 +135,7 @@ public class HttpContextManager implements Listener {
continue;
NamedHttpContextImpl namedContext = (NamedHttpContextImpl) getHttpContext(httpContextName);
- namedContext.removeHttpContext(extension);
+ namedContext.removeHttpContext(httpContextElement);
}
}
diff --git a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/NamedHttpContextImpl.java b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/NamedHttpContextImpl.java
index 6130a2f7a..a472526f1 100644
--- a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/NamedHttpContextImpl.java
+++ b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/NamedHttpContextImpl.java
@@ -16,7 +16,7 @@ import java.net.URL;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IConfigurationElement;
import org.osgi.service.http.HttpContext;
public class NamedHttpContextImpl implements HttpContext {
@@ -81,13 +81,13 @@ public class NamedHttpContextImpl implements HttpContext {
return result;
}
- public synchronized void addHttpContext(IExtension extension, HttpContext context) {
- httpContexts.put(extension, context);
+ public synchronized void addHttpContext(IConfigurationElement httpContextElement, HttpContext context) {
+ httpContexts.put(httpContextElement, context);
snapshot = null;
}
- public synchronized void removeHttpContext(IExtension extension) {
- httpContexts.remove(extension);
+ public synchronized void removeHttpContext(IConfigurationElement httpContextElement) {
+ httpContexts.remove(httpContextElement);
snapshot = null;
}

Back to the top