You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by Gregory Block <gb...@ctoforaday.com> on 2005/01/13 12:29:28 UTC
Re: MacroImpl commit on HEAD... Also for 2.1?
Dumb question: Doesn't this patch also apply to the 2.1 branch?
On 6 Jan 2005, at 18:08, luetzkendorf@apache.org wrote:
> luetzkendorf 2005/01/06 10:08:56
>
> Modified: src/share/org/apache/slide/macro MacroImpl.java
> Log:
> fix for bug: after copy/move of non collection resource with
> content-length: 0 returns GET "not-found"
>
> Revision Changes Path
> 1.55 +6 -5
> jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
>
> Index: MacroImpl.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/
> MacroImpl.java,v
> retrieving revision 1.54
> retrieving revision 1.55
> diff -u -r1.54 -r1.55
> --- MacroImpl.java 20 Dec 2004 12:07:24 -0000 1.54
> +++ MacroImpl.java 6 Jan 2005 18:08:56 -0000 1.55
> @@ -33,6 +33,7 @@
> import org.apache.slide.common.Domain;
> import org.apache.slide.common.Namespace;
> import org.apache.slide.common.NamespaceConfig;
> +import org.apache.slide.common.PropertyName;
> import org.apache.slide.common.ServiceAccessException;
> import org.apache.slide.common.SlideException;
> import org.apache.slide.common.SlideToken;
> @@ -826,7 +827,7 @@
> NodeRevisionDescriptor sourceNrd =
> contentHelper.retrieve(token, sourceNrds);
> NodeRevisionContent sourceNrc = null;
> - if (sourceNrd.getContentLength() > 0) {
> + if
> (!sourceNrd.propertyValueContains(PropertyName.RESOURCE_TYPE,
> "collection")) {
> sourceNrc =
> contentHelper.retrieve(token, sourceNrds,
> sourceNrd);
> }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org
Re: MacroImpl commit on HEAD... Also for 2.1?
Posted by Stefan Lützkendorf <lu...@apache.org>.
yep, done.
Stefan
Gregory Block wrote:
> Dumb question: Doesn't this patch also apply to the 2.1 branch?
>
> On 6 Jan 2005, at 18:08, luetzkendorf@apache.org wrote:
>
>> luetzkendorf 2005/01/06 10:08:56
>>
>> Modified: src/share/org/apache/slide/macro MacroImpl.java
>> Log:
>> fix for bug: after copy/move of non collection resource with
>> content-length: 0 returns GET "not-found"
>>
>> Revision Changes Path
>> 1.55 +6 -5
>> jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
>>
>> Index: MacroImpl.java
>> ===================================================================
>> RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/
>> MacroImpl.java,v
>> retrieving revision 1.54
>> retrieving revision 1.55
>> diff -u -r1.54 -r1.55
>> --- MacroImpl.java 20 Dec 2004 12:07:24 -0000 1.54
>> +++ MacroImpl.java 6 Jan 2005 18:08:56 -0000 1.55
>> @@ -33,6 +33,7 @@
>> import org.apache.slide.common.Domain;
>> import org.apache.slide.common.Namespace;
>> import org.apache.slide.common.NamespaceConfig;
>> +import org.apache.slide.common.PropertyName;
>> import org.apache.slide.common.ServiceAccessException;
>> import org.apache.slide.common.SlideException;
>> import org.apache.slide.common.SlideToken;
>> @@ -826,7 +827,7 @@
>> NodeRevisionDescriptor sourceNrd =
>> contentHelper.retrieve(token, sourceNrds);
>> NodeRevisionContent sourceNrc = null;
>> - if (sourceNrd.getContentLength() > 0) {
>> + if
>> (!sourceNrd.propertyValueContains(PropertyName.RESOURCE_TYPE,
>> "collection")) {
>> sourceNrc =
>> contentHelper.retrieve(token, sourceNrds,
>> sourceNrd);
>> }
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
>> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>
--
Stefan Lützkendorf -- luetzkendorf@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org