Return-Path: 
 <cocoon-cvs-return-3082-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 37271 invoked by uid 500); 6 Aug 2001 15:40:25 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 37262 invoked by uid 500); 6 Aug 2001 15:40:25 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 6 Aug 2001 15:38:58 -0000
Message-ID: <20010806153858.89518.qmail@icarus.apache.org>
From: haul@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit:
 xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java
 esql.xsl
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

haul        01/08/06 08:38:58

  Modified:    src/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl
  Log:
  Patch by Arnaud Bienvenu <arnaud.bienvenu@generasound.com>
  fixes NPE in get-columns when column contains null
  
  Revision  Changes    Path
  1.16      +4 -2      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- esql.xsl	2001/07/30 09:20:20	1.15
  +++ esql.xsl	2001/08/06 15:38:57	1.16
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!-- $Id: esql.xsl,v 1.15 2001/07/30 09:20:20 haul Exp $-->
  +<!-- $Id: esql.xsl,v 1.16 2001/08/06 15:38:57 haul Exp $-->
   <!--
   
    ============================================================================
  @@ -1079,8 +1079,10 @@
         <xsl:value-of select="$resultset"/>.getString(<xsl:value-of select="$column-spec"/>)
       </xsl:when>
       <xsl:otherwise>
  -      new String (<xsl:value-of select="$resultset"/>.getBytes
  +      <xsl:value-of select="$resultset"/>.getBytes(<xsl:value-of select="$column-spec"/>)
  +      != null ? new String (<xsl:value-of select="$resultset"/>.getBytes
           (<xsl:value-of select="$column-spec"/>), <xsl:value-of select="$encoding"/>)
  +      : ""
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
  
  
  

----------------------------------------------------------------------
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