geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r178403 - /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Date Wed, 25 May 2005 07:23:21 GMT
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);



Mime
View raw message