[ jEdit-commits ] SF.net SVN: jedit:[24528] plugins/XML/trunk/xml/parser

[<ker...@us...>]

Revision: 24528
          http://sourceforge.net/p/jedit/svn/24528
Author:   kerik-sf
Date:     2016-09-12 15:11:43 +0000 (Mon, 12 Sep 2016)
Log Message:
-----------
fix #4020 XML with entity and xml schema produces error and breaks jEdit UI

never create a DefaultError with null message

Modified Paths:
--------------
    plugins/XML/trunk/xml/parser/ErrorListErrorHandler.java
    plugins/XML/trunk/xml/parser/XercesParserImpl.java

Modified: plugins/XML/trunk/xml/parser/ErrorListErrorHandler.java
===================================================================
--- plugins/XML/trunk/xml/parser/ErrorListErrorHandler.java	2016-09-09 07:09:30 UTC (rev 24527)
+++ plugins/XML/trunk/xml/parser/ErrorListErrorHandler.java	2016-09-12 15:11:43 UTC (rev 24528)
@@ -63,7 +63,8 @@
 		}else{
 			path = PathUtilities.urlToPath(systemId);
 		}
-		errorSource.addError(type,path,line,0,col,exception.getMessage());
+		String msg = exception.getMessage() == null ? exception.toString() : exception.getMessage();
+		errorSource.addError(type, path, line, 0, col, msg);
 	}// }}}
 	
 	//{{{ error() method

Modified: plugins/XML/trunk/xml/parser/XercesParserImpl.java
===================================================================
--- plugins/XML/trunk/xml/parser/XercesParserImpl.java	2016-09-09 07:09:30 UTC (rev 24527)
+++ plugins/XML/trunk/xml/parser/XercesParserImpl.java	2016-09-12 15:11:43 UTC (rev 24528)
@@ -263,7 +263,7 @@
 			{
 				String msg = "SAX exception while parsing";
 				Throwable t = se.getException();
-				if(msg != null){
+				if(se.getMessage() != null){
 					msg+=": "+se.getMessage();
 				}
 				if(t!=null){
@@ -276,8 +276,9 @@
 			}
 			catch(RuntimeException re)
 			{
+				String msg = re.getMessage() == null ? re.toString() : re.getMessage();
 				errorSource.addError(ErrorSource.ERROR,buffer.getPath(),
-						0,0,0,re.getMessage());
+						0,0,0,msg);
 				Log.log(Log.ERROR, XercesParserImpl.class, "RuntimeException parsing", re);
 			}
 			catch(Error e)
@@ -401,7 +402,7 @@
 				{
 					String msg = "SAX exception while parsing (constructing sidekick tree)";
 					Throwable t = se.getException();
-					if(msg != null){
+					if(se.getMessage() != null){
 						msg+=": "+se.getMessage();
 					}
 					if(t!=null){

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.