jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdaw...@apache.org
Subject cvs commit: jakarta-taglibs/i18n/src/org/apache/taglibs/i18n ConditionalTagSupport.java
Date Tue, 16 Oct 2001 03:59:03 GMT
tdawson     01/10/15 20:59:03

  Modified:    i18n/src/org/apache/taglibs/i18n ConditionalTagSupport.java
  Log:
  fixed NPE pointed out by Thomas Bruckner
  
  Revision  Changes    Path
  1.3       +7 -4      jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java
  
  Index: ConditionalTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConditionalTagSupport.java	2001/10/14 22:09:23	1.2
  +++ ConditionalTagSupport.java	2001/10/16 03:59:03	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java,v
1.2 2001/10/14 22:09:23 tdawson Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/10/14 22:09:23 $
  + * $Header: /home/cvs/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/ConditionalTagSupport.java,v
1.3 2001/10/16 03:59:03 tdawson Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/10/16 03:59:03 $
    *
    * ====================================================================
    * 
  @@ -128,7 +128,10 @@
       if ( _bundle == null )
           {
           BundleTag bundleTag = (BundleTag)this.findAncestorWithClass(this,BundleTag.class);
  -        _bundle = bundleTag.getBundle();
  +        if (bundleTag != null)
  +            {
  +            _bundle = bundleTag.getBundle();
  +            }
           }
       if ( _bundle == null )
           {
  
  
  

Mime
View raw message