You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by fe...@apache.org on 2004/03/10 04:43:58 UTC

cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml XPathUtil.java

felipeal    2004/03/09 19:43:58

  Modified:    standard/src/org/apache/taglibs/standard/tag/common/xml Tag:
                        STANDARD_1_0_BRANCH XPathUtil.java
  Log:
  Fix for bug 26614: remove quotes from prefix when throwing an exception, as noted by Kris
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.8.2.3   +3 -2      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
  
  Index: XPathUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- XPathUtil.java	28 Feb 2004 06:08:11 -0000	1.8.2.2
  +++ XPathUtil.java	10 Mar 2004 03:43:58 -0000	1.8.2.3
  @@ -155,8 +155,9 @@
   
   	private Object notNull(Object o, String prefix, String localName)
   	        throws UnresolvableException {
  -	    if (o == null)
  -		throw new UnresolvableException("$" + prefix + ":" + localName);
  +            if (o == null) {
  +                throw new UnresolvableException("$" + (prefix==null?"":prefix+":") + localName);
  +            }
   	    return o;
   	}
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org