diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ProxyContext.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ProxyContext.java
index c668225..4c66f40 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ProxyContext.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/ProxyContext.java
@@ -67,7 +67,7 @@
 			ContextAttributes contextAttributes = attributesMap.get(controller);
 
 			if (contextAttributes == null) {
-				contextAttributes = new ContextAttributes(controller);
+				contextAttributes = new ContextAttributes(controller, proxyContextTempDir);
 
 				attributesMap.put(controller, contextAttributes);
 			}
@@ -122,13 +122,13 @@
 		return directory.delete();
 	}
 
-	public class ContextAttributes
+	public static class ContextAttributes
 		extends Dictionary<String, Object> implements Serializable {
 
 		private static final long serialVersionUID = 1916670423277243587L;
 		private final AtomicInteger referenceCount = new AtomicInteger();
 
-		public ContextAttributes(ContextController controller) {
+		public ContextAttributes(ContextController controller, File proxyContextTempDir) {
 			if (proxyContextTempDir != null) {
 				File contextTempDir = new File(
 					proxyContextTempDir,