You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/05/25 09:23:21 UTC
svn commit: r178403 -
/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Author: jgenender
Date: Wed May 25 00:23:20 2005
New Revision: 178403
URL: http://svn.apache.org/viewcvs?rev=178403&view=rev
Log:
Fixed NPE for setting the class loader. Using the WebClassLoader instead
Modified:
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=178403&r1=178402&r2=178403&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Wed May 25 00:23:20 2005
@@ -59,15 +59,13 @@
Map componentContext = ctx.getComponentContext();
try {
if (componentContext != null) {
- for (Iterator iterator = componentContext.values().iterator(); iterator
- .hasNext();) {
+ for (Iterator iterator = componentContext.values().iterator(); iterator.hasNext();) {
Object value = iterator.next();
if (value instanceof KernelAwareReference) {
((KernelAwareReference) value).setKernel(ctx.getKernel());
}
if (value instanceof ClassLoaderAwareReference) {
- ((ClassLoaderAwareReference) value)
- .setClassLoader(getLoader().getClassLoader());
+ ((ClassLoaderAwareReference) value).setClassLoader(ctx.getWebClassLoader());
}
}
enc = new SimpleReadOnlyContext(componentContext);