You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/06/08 23:04:08 UTC

svn commit: r664554 - /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java

Author: djencks
Date: Sun Jun  8 14:04:07 2008
New Revision: 664554

URL: http://svn.apache.org/viewvc?rev=664554&view=rev
Log:
GERONIMO-4090 non-overridable-classes apply to the current classloader as well as children

Modified:
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java?rev=664554&r1=664553&r2=664554&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java Sun Jun  8 14:04:07 2008
@@ -342,7 +342,7 @@
         String[] hiddenClasses = hiddenClassesSet.toArray(new String[hiddenClassesSet.size()]);
 
         // we need to propagate the non-overrideable classes from parents
-        LinkedHashSet<String> nonOverridableSet = new LinkedHashSet<String>();
+        LinkedHashSet<String> nonOverridableSet = new LinkedHashSet<String>(environment.getNonOverrideableClasses());
         for (Configuration parent : classParents) {
 
             Environment parentEnvironment = parent.getEnvironment();