cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Parser.java

[luehe]

luehe       2002/07/08 16:47:55

  Modified:    jasper2/src/share/org/apache/jasper/compiler Parser.java
  Log:
  Fixed Bug# 10126: NullPointerException when no uri defined in taglib directive
  
  Revision  Changes    Path
  1.7       +5 -5      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Parser.java       20 Jun 2002 20:12:26 -0000      1.6
  +++ Parser.java       8 Jul 2002 23:47:55 -0000       1.7
  @@ -348,11 +348,11 @@
        Attributes attrs = parseAttributes();
        String uri = attrs.getValue("uri");
        String prefix = attrs.getValue("prefix");
  -     if (uri != null || prefix != null) {
  +     if (uri != null && prefix != null) {
            // Errors to be checked in Validator
            String[] location = ctxt.getTldLocation(uri);
            TagLibraryInfo tl = new TagLibraryInfoImpl(ctxt, prefix, uri,
  -                                                location, err);
  +                                                    location, err);
            taglibs.put(prefix, tl);
        }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>