You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@cocoon.apache.org by Vadim Gritsenko <va...@reverycodes.com> on 2005/01/24 16:30:32 UTC

Re: svn commit: r125954 - /cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java

antonio@apache.org wrote:
> --- cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java	(original)
> +++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/EsqlHelper.java	Fri Jan 21 11:24:22 2005
> @@ -73,9 +69,7 @@
>                  buffer = new byte[length];
>                  reader.read(buffer);
>                  reader.close();
> -                if (buffer == null)
> -                    return null;
> -                return buffer;
> +                return buffer != null ? buffer : null;

You can just return buffer here:

> +                return buffer;

:)

PS Do you think it's time to merge your changes to 2.2? It makes harder to keep 
branches in sync when they are already not...

Vadim