forked from jruby/jruby
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for JRUBY-4677: Java exceptions can't be rescued with "rescue Exc…
…eption" This fixes the problem by modifying all rescue blocks to handle Java exceptions when they're rescueing "Exception" as well as handling Ruby exceptions. It feels like the way it should work from the Ruby side, but I worry about it from the Java side. I had to introduce a new Unrescuable marker to allow some internal exceptions to propagate. All tests pass, specs pass the same.
- Loading branch information
Showing
8 changed files
with
110 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,38 @@ | |||
/***** BEGIN LICENSE BLOCK ***** | |||
* Version: CPL 1.0/GPL 2.0/LGPL 2.1 | |||
* | |||
* The contents of this file are subject to the Common Public | |||
* License Version 1.0 (the "License"); you may not use this file | |||
* except in compliance with the License. You may obtain a copy of | |||
* the License at http://www.eclipse.org/legal/cpl-v10.html | |||
* | |||
* Software distributed under the License is distributed on an "AS | |||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or | |||
* implied. See the License for the specific language governing | |||
* rights and limitations under the License. | |||
* | |||
* Copyright (C) 2010 Charles O Nutter <headius@headius.com> | |||
* | |||
* Alternatively, the contents of this file may be used under the terms of | |||
* either of the GNU General Public License Version 2 or later (the "GPL"), | |||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | |||
* in which case the provisions of the GPL or the LGPL are applicable instead | |||
* of those above. If you wish to allow use of your version of this file only | |||
* under the terms of either the GPL or the LGPL, and not to allow others to | |||
* use your version of this file under the terms of the CPL, indicate your | |||
* decision by deleting the provisions above and replace them with the notice | |||
* and other provisions required by the GPL or the LGPL. If you do not delete | |||
* the provisions above, a recipient may use your version of this file under | |||
* the terms of any one of the CPL, the GPL or the LGPL. | |||
***** END LICENSE BLOCK *****/ | |||
package org.jruby.exceptions; | |||
|
|||
/** | |||
* This marker interface is for JRuby internal exceptions that can't be caught | |||
* by Ruby exception handling. | |||
* | |||
* @author headius | |||
*/ | |||
public interface Unrescuable { | |||
|
|||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters