xml-xalan-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minc...@apache.org
Subject cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler Parser.java UnsupportedElement.java
Date Thu, 16 Oct 2003 16:17:02 GMT
minchau     2003/10/16 09:17:02

  Modified:    java/src/org/apache/xalan/xsltc/compiler Tag:
                        xslt20-compiled Parser.java UnsupportedElement.java
  Log:
  fix for bugzilla 23706.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.59.2.1  +5 -3      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java,v
  retrieving revision 1.59
  retrieving revision 1.59.2.1
  diff -u -r1.59 -r1.59.2.1
  --- Parser.java	14 Aug 2003 16:27:43 -0000	1.59
  +++ Parser.java	16 Oct 2003 16:17:01 -0000	1.59.2.1
  @@ -973,9 +973,11 @@
   		if (uri.equals(XSLT_URI)) {
   		    node = new UnsupportedElement(uri, prefix, local);
   		    UnsupportedElement element = (UnsupportedElement)node;
  -		    ErrorMsg msg = new ErrorMsg(ErrorMsg.UNSUPPORTED_XSL_ERR,
  +		    if (versionIsOne) {
  +		    	ErrorMsg msg = new ErrorMsg(ErrorMsg.UNSUPPORTED_XSL_ERR,
   						_locator.getLineNumber(),local);
  -		    element.setErrorMessage(msg);
  +		    	element.setErrorMessage(msg);
  +		    }
   		}
   		// Check if this is an XSLTC extension element
   		else if (uri.equals(TRANSLET_URI)) {
  
  
  
  1.5.6.1   +5 -5      xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java
  
  Index: UnsupportedElement.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java,v
  retrieving revision 1.5
  retrieving revision 1.5.6.1
  diff -u -r1.5 -r1.5.6.1
  --- UnsupportedElement.java	30 Jan 2003 18:46:02 -0000	1.5
  +++ UnsupportedElement.java	16 Oct 2003 16:17:01 -0000	1.5.6.1
  @@ -146,10 +146,10 @@
        * Run type check on the fallback element (if any).
        */
       public Type typeCheck(SymbolTable stable) throws TypeCheckError {
  -	if (_fallback == null) {
  -	    throw new TypeCheckError(_message);
  -	}
  -	return(_fallback.typeCheck(stable));
  +		if (_fallback != null) {
  +			_fallback.typeCheck(stable);
  +		}
  +		return Type.Void;
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message