cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/servlet CocoonServlet.java
Date Wed, 04 Apr 2001 18:06:30 GMT
bloritsch    01/04/04 11:06:30

  Modified:    lib      Tag: xml-cocoon2 avalonapi.jar
               src/org/apache/cocoon/components Tag: xml-cocoon2
                        ComponentPool.java
               src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        CocoonServlet.java
  Log:
  Avoid infinite loop if component cannot be instantiated due to system
  issues, etc.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.31  +574 -544  xml-cocoon/lib/Attic/avalonapi.jar
  
  	<<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +0 -10     xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentPool.java
  
  Index: ComponentPool.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentPool.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- ComponentPool.java	2001/04/02 17:10:02	1.1.2.5
  +++ ComponentPool.java	2001/04/04 18:06:29	1.1.2.6
  @@ -89,16 +89,6 @@
               }
           }
   
  -        if ((this.availableResources.size() < this.initial) && (this.availableResources.size()
> 0)) {
  -            while (this.availableResources.size() < this.initial) {
  -                try {
  -                    this.availableResources.add(this.factory.newInstance());
  -                } catch (Exception e) {
  -                    getLogger().warn("Could not create poolable resource", e);
  -                }
  -            }
  -        }
  -
           if (this.availableResources.size() > 0) {
               this.initialized = true;
           }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.78  +8 -6      xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
  retrieving revision 1.1.4.77
  retrieving revision 1.1.4.78
  diff -u -r1.1.4.77 -r1.1.4.78
  --- CocoonServlet.java	2001/04/04 06:11:40	1.1.4.77
  +++ CocoonServlet.java	2001/04/04 18:06:30	1.1.4.78
  @@ -62,7 +62,7 @@
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.4.77 $ $Date: 2001/04/04 06:11:40 $
  + * @version CVS $Revision: 1.1.4.78 $ $Date: 2001/04/04 18:06:30 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -122,14 +122,16 @@
           } else {
               workDir = (File) context.getAttribute("javax.servlet.context.tempdir");
           }
  +
           this.appContext.put(Constants.CONTEXT_WORK_DIR, workDir);
   
  -		String uploadDirParam = conf.getInitParameter("upload-directory");
  +        String uploadDirParam = conf.getInitParameter("upload-directory");
           if ((uploadDirParam != null) && (uploadDirParam.trim().equals("") == false))
{
  -			this.uploadDir = IOUtils.createFile( new File(context.getRealPath("/")) , uploadDirParam);
  -		} else	{
  -			this.uploadDir = IOUtils.createFile(workDir, "image-dir" + File.separator);
  -		}
  +            this.uploadDir = IOUtils.createFile( new File(context.getRealPath("/")) , uploadDirParam);
  +        } else	{
  +            this.uploadDir = IOUtils.createFile(workDir, "image-dir" + File.separator);
  +        }
  +
           this.appContext.put(Constants.CONTEXT_UPLOAD_DIR, this.uploadDir);
           this.uploadDir.mkdirs();
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message