bloritsch    01/06/14 07:44:04

  Modified:    .        Tag: cocoon_20_branch changes.xml
               src/org/apache/cocoon/components/url Tag: cocoon_20_branch
                        URLFactoryImpl.java
  Log:
    <action dev="BL" type="fix" bug="2142">
      Applied fix to URLFactoryImpl donated by [EMAIL PROTECTED]
    </action>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.6   +4 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.2.2.5
  retrieving revision 1.2.2.6
  diff -u -r1.2.2.5 -r1.2.2.6
  --- changes.xml       2001/06/12 16:21:20     1.2.2.5
  +++ changes.xml       2001/06/14 14:44:04     1.2.2.6
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.2.2.5 2001/06/12 16:21:20 bloritsch Exp $
  +  $Id: changes.xml,v 1.2.2.6 2001/06/14 14:44:04 bloritsch Exp $
   -->
   
   <changes title="History of Changes">
  @@ -24,6 +24,9 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="BL" type="fix" bug="2142">
  +    Applied fix to URLFactoryImpl donated by [EMAIL PROTECTED]
  +  </action>
     <action dev="BL" type="add">
       Added support for fine-grained pool size control for Excalibur Component
       Architecture.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +3 -3      
xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java
  
  Index: URLFactoryImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- URLFactoryImpl.java       2001/05/25 17:15:44     1.2
  +++ URLFactoryImpl.java       2001/06/14 14:44:04     1.2.2.1
  @@ -29,7 +29,7 @@
   
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
  - * @version $Id: URLFactoryImpl.java,v 1.2 2001/05/25 17:15:44 dims Exp $
  + * @version $Id: URLFactoryImpl.java,v 1.2.2.1 2001/06/14 14:44:04 bloritsch Exp $
    */
   public class URLFactoryImpl extends AbstractLoggable implements URLFactory, 
Component, Configurable, Contextualizable {
   
  @@ -68,7 +68,7 @@
   
               org.apache.cocoon.environment.Context envContext = null;
               try {
  -                envContext = (org.apache.cocoon.environment.Context) 
  +                envContext = (org.apache.cocoon.environment.Context)
                                   context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
               } catch (ContextException e){
                   getLogger().error("Making URL - ContextException in getURL",e);
  @@ -93,7 +93,7 @@
   
       public URL getURL(URL base, String location) throws MalformedURLException {
           if ( base != null ) {
  -            return getURL(base.toExternalForm() + location);
  +            return getURL(new URL(base, location).toExternalForm());
           } else {
               return getURL(location);
           }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to