remm        2004/07/23 15:40:11

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappClassLoader.java WebappLoader.java
  Log:
  - enum -> enumeration (JDK 1.5 update).
  
  Revision  Changes    Path
  1.39      +7 -7      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- WebappClassLoader.java    3 Jul 2004 19:51:14 -0000       1.38
  +++ WebappClassLoader.java    23 Jul 2004 22:40:11 -0000      1.39
  @@ -703,10 +703,10 @@
           if (getJarPath() != null) {
   
               try {
  -                NamingEnumeration enum = resources.listBindings(getJarPath());
  +                NamingEnumeration enumeration = 
resources.listBindings(getJarPath());
                   int i = 0;
  -                while (enum.hasMoreElements() && (i < length)) {
  -                    NameClassPair ncPair = (NameClassPair) enum.nextElement();
  +                while (enumeration.hasMoreElements() && (i < length)) {
  +                    NameClassPair ncPair = (NameClassPair) 
enumeration.nextElement();
                       String name = ncPair.getName();
                       // Ignore non JARs present in the lib folder
                       if (!name.endsWith(".jar"))
  @@ -719,10 +719,10 @@
                       }
                       i++;
                   }
  -                if (enum.hasMoreElements()) {
  -                    while (enum.hasMoreElements()) {
  +                if (enumeration.hasMoreElements()) {
  +                    while (enumeration.hasMoreElements()) {
                           NameClassPair ncPair = 
  -                            (NameClassPair) enum.nextElement();
  +                            (NameClassPair) enumeration.nextElement();
                           String name = ncPair.getName();
                           // Additional non-JAR files are allowed
                           if (name.endsWith(".jar")) {
  
  
  
  1.30      +7 -7      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- WebappLoader.java 23 Jun 2004 16:59:41 -0000      1.29
  +++ WebappLoader.java 23 Jul 2004 22:40:11 -0000      1.30
  @@ -985,10 +985,10 @@
   
               // Looking up directory /WEB-INF/lib in the context
               try {
  -                NamingEnumeration enum = resources.listBindings(libPath);
  -                while (enum.hasMoreElements()) {
  +                NamingEnumeration enumeration = resources.listBindings(libPath);
  +                while (enumeration.hasMoreElements()) {
   
  -                    Binding binding = (Binding) enum.nextElement();
  +                    Binding binding = (Binding) enumeration.nextElement();
                       String filename = libPath + "/" + binding.getName();
                       if (!filename.endsWith(".jar"))
                           continue;
  @@ -1137,10 +1137,10 @@
   
           try {
   
  -            NamingEnumeration enum = srcDir.list("");
  -            while (enum.hasMoreElements()) {
  +            NamingEnumeration enumeration = srcDir.list("");
  +            while (enumeration.hasMoreElements()) {
                   NameClassPair ncPair =
  -                    (NameClassPair) enum.nextElement();
  +                    (NameClassPair) enumeration.nextElement();
                   String name = ncPair.getName();
                   Object object = srcDir.lookup(name);
                   File currentFile = new File(destDir, name);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to