cvs commit: jahia/core/src/java/org/jahia/services/htmlparser WAIValidator.java jahia/core/src/java/org/jahia/utils JahiaTools.java

[Xavier Lawrence]

xlawrence    2005/08/02 18:33:20 CEST

  Modified files:
    core/src/java/org/jahia/services/htmlparser WAIValidator.java 
    core/src/java/org/jahia/utils JahiaTools.java 
  Log:
  fix. prevent NPE in case of anchors
  
  Revision  Changes    Path
  1.6       +6 -1      
jahia/core/src/java/org/jahia/services/htmlparser/WAIValidator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/htmlparser/WAIValidator.java.diff?r1=1.5&r2=1.6&f=h
  1.8       +2 -2      jahia/core/src/java/org/jahia/utils/JahiaTools.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/utils/JahiaTools.java.diff?r1=1.7&r2=1.8&f=h
  
  
  
  Index: WAIValidator.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/htmlparser/WAIValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WAIValidator.java 29 Jul 2005 15:23:28 -0000      1.5
  +++ WAIValidator.java 2 Aug 2005 16:33:19 -0000       1.6
  @@ -292,6 +292,11 @@
       throws DOMException {
           logger.info("validateLink");
           
  +        final Node href = node.getAttributes().getNamedItem("href");
  +        if (href == null) {
  +            return null;
  +        }
  +        
           // Criteria 6.1
           final String linkValue = JahiaTools.text2XMLEntityRef(
                   node.getFirstChild().getNodeValue(), 1);
  @@ -327,7 +332,7 @@
           }
           
           // Criteria 6.5
  -        final String hrefValue = 
node.getAttributes().getNamedItem("href").getNodeValue();
  +        final String hrefValue = href.getNodeValue();
           if (linkToDest.containsKey(linkValue)) {
               final String dest = (String)linkToDest.get(linkValue);
               
  
  
  
  Index: JahiaTools.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/utils/JahiaTools.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JahiaTools.java   5 Jul 2005 15:46:39 -0000       1.7
  +++ JahiaTools.java   2 Aug 2005 16:33:19 -0000       1.8
  @@ -1,4 +1,4 @@
  -// $Id: JahiaTools.java,v 1.7 2005/07/05 15:46:39 shuber Exp $
  +// $Id: JahiaTools.java,v 1.8 2005/08/02 16:33:19 xlawrence Exp $
   //
   //                                   ____.
   //                       __/\ ______|    |__/\.     _______
  @@ -1121,7 +1121,7 @@
       public static String text2XMLEntityRef(String str, int invert)
       {
           if ( str == null || str.trim().equals("") ){
  -            return str;
  +            return "";
           }
           if (invert == 0) {  // Change by MAP
               str = TextHtml.text2html(str);