svn commit: r802871 - /struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java

[musachy]

Author: musachy
Date: Mon Aug 10 17:41:31 2009
New Revision: 802871

URL: http://svn.apache.org/viewvc?rev=802871&view=rev
Log:
Get classloader interface from ServletContext

Modified:
    
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java

Modified: 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java?rev=802871&r1=802870&r2=802871&view=diff
==============================================================================
--- 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java
 (original)
+++ 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java
 Mon Aug 10 17:41:31 2009
@@ -38,6 +38,7 @@
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
+import javax.servlet.ServletContext;
 import javax.servlet.jsp.JspPage;
 import javax.tools.*;
 import java.io.File;
@@ -208,9 +209,9 @@
 
     private ClassLoaderInterface getClassLoaderInterface() {
         ClassLoaderInterface classLoaderInterface = null;
-        ActionContext ctx = ActionContext.getContext();
+        ServletContext ctx =  ServletActionContext.getServletContext();
         if (ctx != null)
-            classLoaderInterface = (ClassLoaderInterface) 
ctx.get(ClassLoaderInterface.CLASS_LOADER_INTERFACE);
+            classLoaderInterface = (ClassLoaderInterface) 
ctx.getAttribute(ClassLoaderInterface.CLASS_LOADER_INTERFACE);
 
         return (ClassLoaderInterface) 
ObjectUtils.defaultIfNull(classLoaderInterface, new 
ClassLoaderInterfaceDelegate(JSPLoader.class.getClassLoader()));
     }