Merge de8c32d into a762738

sparklemotion · Apr 26, 2020 · 6804c7e · 6804c7e
2 parents a762738 + de8c32d
commit 6804c7e
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 18 deletions.
diff --git a/ext/java/nokogiri/HtmlSaxParserContext.java b/ext/java/nokogiri/HtmlSaxParserContext.java
@@ -194,7 +194,7 @@ else if (encoding instanceof RubyFixnum) {
             throw context.getRuntime().newEncodingCompatibilityError(rubyEncoding + "is not supported");
         }
         catch (IllegalCharsetNameException e) {
-            throw context.getRuntime().newInvalidEncoding(e.getMessage());
+            throw context.getRuntime().newEncodingError(e.getMessage());
         }
     }
 

diff --git a/ext/java/nokogiri/HtmlSaxPushParser.java b/ext/java/nokogiri/HtmlSaxPushParser.java
@@ -129,7 +129,7 @@ public IRubyObject native_write(ThreadContext context, IRubyObject chunk, IRubyO
         final ByteArrayInputStream data = NokogiriHelpers.stringBytesToStream(chunk);
         if (data == null) {
             terminateTask(context.runtime);
-            throw new RaiseException(XmlSyntaxError.createHTMLSyntaxError(context.runtime)); // Nokogiri::HTML::SyntaxError
+            throw XmlSyntaxError.createHTMLSyntaxError(context.runtime).toThrowable(); // Nokogiri::HTML::SyntaxError
         }
 
         int errorCount0 = parserTask.getErrorCount();

diff --git a/ext/java/nokogiri/XmlNode.java b/ext/java/nokogiri/XmlNode.java
@@ -1662,7 +1662,7 @@ public IRubyObject process_xincludes(ThreadContext context, IRubyObject options)
         while(errors.getLength() > 0) {
             XmlSyntaxError error = (XmlSyntaxError)errors.shift(context);
             if (error.toString().contains("Include operation failed")) {
-                throw new RaiseException(error);
+                throw error.toThrowable();
             }
         }
         return this;

diff --git a/ext/java/nokogiri/XmlReader.java b/ext/java/nokogiri/XmlReader.java
@@ -328,7 +328,7 @@ private void readMoreData(ThreadContext context) {
             continueParsing = config.parse(false);
         }
         catch (XNIException e) {
-            throw new RaiseException(XmlSyntaxError.createXMLSyntaxError(context.runtime, e)); // Nokogiri::XML::SyntaxError
+            throw XmlSyntaxError.createXMLSyntaxError(context.runtime, e).toThrowable(); // Nokogiri::XML::SyntaxError
         }
         catch (IOException e) {
             throw context.runtime.newRuntimeError(e.toString());
@@ -364,7 +364,7 @@ private IRubyObject setAndRaiseErrorsIfAny(final Ruby runtime, final RaiseExcept
             errors.append(error);
             setInstanceVariable("@errors", errors);
 
-            throw ex != null ? ex : new RaiseException((XmlSyntaxError) error);
+            throw ex != null ? ex : ((XmlSyntaxError) error).toThrowable();
         }
         if ( ex != null ) throw ex;
         return this;

diff --git a/ext/java/nokogiri/XmlSaxParserContext.java b/ext/java/nokogiri/XmlSaxParserContext.java
@@ -94,7 +94,8 @@ protected void initialize(Ruby runtime) {
             parser = createParser();
         }
         catch (SAXException se) {
-            throw RaiseException.createNativeRaiseException(runtime, se);
+            // Unexpected failure in XML subsystem
+            throw runtime.newRuntimeError(se.getMessage());
         }
     }
 
@@ -208,7 +209,8 @@ protected void preParse(Ruby runtime, IRubyObject handlerRuby, NokogiriHandler h
                 parser.setFeature(FEATURE_CONTINUE_AFTER_FATAL_ERROR, true);
             }
             catch (Exception e) {
-                throw RaiseException.createNativeRaiseException(runtime, e);
+                // Unexpected failure in XML subsystem
+                throw runtime.newRuntimeError(e.getMessage());
             }
         }
     }
@@ -261,7 +263,8 @@ public IRubyObject parse_with(ThreadContext context, IRubyObject handlerRuby) {
             }
         }
         catch (SAXException ex) {
-            throw RaiseException.createNativeRaiseException(runtime, ex);
+            // Unexpected failure in XML subsystem
+            throw runtime.newRuntimeError(ex.getMessage());
         }
         catch (IOException ex) {
             throw runtime.newIOErrorFromException(ex);

diff --git a/ext/java/nokogiri/XmlSchema.java b/ext/java/nokogiri/XmlSchema.java
@@ -131,7 +131,7 @@ public static IRubyObject from_document(ThreadContext context, IRubyObject klazz
 
         RubyArray errors = (RubyArray) doc.getInstanceVariable("@errors");
         if (!errors.isEmpty()) {
-            throw new RaiseException((XmlSyntaxError) errors.first());
+            throw ((XmlSyntaxError) errors.first()).toThrowable();
         }
 
         DOMSource source = new DOMSource(doc.getDocument());

diff --git a/ext/java/nokogiri/XmlSyntaxError.java b/ext/java/nokogiri/XmlSyntaxError.java
@@ -120,13 +120,9 @@ public void setException(Ruby runtime, SAXParseException exception, int level) {
         setInstanceVariable("@file", stringOrNil(runtime, exception.getSystemId()));
     }
 
-    // NOTE: special care - due JRuby 1.7.x
-
-    @Override
-    public IRubyObject to_s(ThreadContext context) { return to_s19(context); }
-
     @JRubyMethod(name = "to_s")
-    public RubyString to_s19(ThreadContext context) {
+    @Override
+    public IRubyObject to_s(ThreadContext context) {
         RubyString msg = msg(context.runtime);
         return msg != null ? msg : super.to_s(context).asString();
     }

diff --git a/ext/java/nokogiri/XmlXpathContext.java b/ext/java/nokogiri/XmlXpathContext.java
@@ -163,7 +163,7 @@ private IRubyObject node_set(ThreadContext context, String expr, IRubyObject han
             return tryGetNodeSet(context, expr, fnResolver);
         }
         catch (TransformerException ex) {
-            throw new RaiseException(XmlSyntaxError.createXMLXPathSyntaxError(context.runtime, expr, ex)); // Nokogiri::XML::XPath::SyntaxError
+            throw XmlSyntaxError.createXMLXPathSyntaxError(context.runtime, expr, ex).toThrowable(); // Nokogiri::XML::XPath::SyntaxError
         }
     }
 

diff --git a/ext/java/nokogiri/internals/NokogiriHandler.java b/ext/java/nokogiri/internals/NokogiriHandler.java
@@ -249,7 +249,7 @@ void handleError(SAXParseException ex) {
         try {
             final String msg = ex.getMessage();
             call("error", runtime.newString(msg == null ? "" : msg));
-            addError(new RaiseException(XmlSyntaxError.createError(runtime, ex), true));
+            addError(XmlSyntaxError.createError(runtime, ex).toThrowable());
         } catch( RaiseException e) {
             addError(e);
             throw e;

diff --git a/ext/java/nokogiri/internals/XmlDomParserContext.java b/ext/java/nokogiri/internals/XmlDomParserContext.java
@@ -196,7 +196,7 @@ public XmlDocument getDocumentWithErrorsOrRaiseException(ThreadContext context,
         } else {
             XmlSyntaxError xmlSyntaxError = XmlSyntaxError.createXMLSyntaxError(context.runtime);
             xmlSyntaxError.setException(ex);
-            throw new RaiseException(xmlSyntaxError);
+            throw xmlSyntaxError.toThrowable();
         }
     }