cvs commit: jakarta-slide/src/share/org/apache/slide/common Namespace.java

[remm]

remm        01/02/03 12:20:51

  Modified:    src/share/org/apache/slide/common Namespace.java
  Log:
  - JDK 1.1 compatibility fix.
    Bug reported by Sixten Otto.
    Note: I don't have JDK 1.1 on my dev machine, so if there are other issues,
    please report them.
  
  Revision  Changes    Path
  1.19      +13 -5     jakarta-slide/src/share/org/apache/slide/common/Namespace.java
  
  Index: Namespace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Namespace.java    2001/01/20 20:02:01     1.18
  +++ Namespace.java    2001/02/03 20:20:50     1.19
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.18 
2001/01/20 20:02:01 remm Exp $
  - * $Revision: 1.18 $
  - * $Date: 2001/01/20 20:02:01 $
  + * $Header: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v 1.19 
2001/02/03 20:20:50 remm Exp $
  + * $Revision: 1.19 $
  + * $Date: 2001/02/03 20:20:50 $
    *
    * ====================================================================
    *
  @@ -92,7 +92,7 @@
    * Namespace class.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
  - * @version $Revision: 1.18 $
  + * @version $Revision: 1.19 $
    */
   public final class Namespace {
       
  @@ -858,10 +858,18 @@
               return null;
           }
           
  +        // Retrieve parent parameters
  +        Hashtable childStoreParameters = new Hashtable();
  +        Enumeration fatherParametersKeys = fatherParameters.keys();
  +        while (fatherParametersKeys.hasMoreElements()) {
  +            Object key = fatherParametersKeys.nextElement();
  +            Object value = fatherParameters.get(key);
  +            childStoreParameters.put(key, value);
  +        }
  +        
           // Load parameters
           Enumeration childStoreParametersDefinitions =
               childStoreDefinition.getConfigurations("parameter");
  -        Hashtable childStoreParameters = new Hashtable(fatherParameters);
           while (childStoreParametersDefinitions.hasMoreElements()) {
               Configuration parameterDefinition = (Configuration)
                   childStoreParametersDefinitions.nextElement();