Index: Sources/er/extensions/appserver/ERXApplication.java
===================================================================
--- Sources/er/extensions/appserver/ERXApplication.java	(revision 8444)
+++ Sources/er/extensions/appserver/ERXApplication.java	(working copy)
@@ -753,8 +753,14 @@
 				setContextClassName(ERXWOContext.class.getName());
 			}
 		}
-		if (contextClassName().equals("WOServletContext") || contextClassName().equals("com.webobjects.appserver.jspservlet.WOServletContext"))
-			setContextClassName(ERXWOServletContext.class.getName());
+		if (contextClassName().equals("WOServletContext") || contextClassName().equals("com.webobjects.appserver.jspservlet.WOServletContext")) {
+			if (ERXApplication.isWO54()) {
+				setContextClassName("ERXWOServletContext54");
+			}
+			else {
+				setContextClassName(ERXWOServletContext.class.getName());
+			}
+		}
 
 		ERXPatcher.setClassForName(ERXWOForm.class, "WOForm");
 		try {