[Ikvm-commit] ikvm/runtime ClassLoaderWrapper.cs, 1.226, 1.227 JavaException.cs, 1.17, 1.18
Brought to you by:
jfrijters
|
From: Jeroen F. <jfr...@us...> - 2014-06-24 10:32:19
|
Update of /cvsroot/ikvm/ikvm/runtime In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3829 Modified Files: ClassLoaderWrapper.cs JavaException.cs Log Message: Fixed regression introduced by previous commit. We should not introduce SecurityException, because it conflicts with System.Security.SecurityException. Index: JavaException.cs =================================================================== RCS file: /cvsroot/ikvm/ikvm/runtime/JavaException.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** JavaException.cs 24 Jun 2014 09:44:37 -0000 1.17 --- JavaException.cs 24 Jun 2014 10:32:16 -0000 1.18 *************** *** 218,224 **** } ! sealed class SecurityException : RetargetableJavaException { ! internal SecurityException(string msg) : base(msg) { --- 218,224 ---- } ! sealed class JavaSecurityException : RetargetableJavaException { ! internal JavaSecurityException(string msg) : base(msg) { Index: ClassLoaderWrapper.cs =================================================================== RCS file: /cvsroot/ikvm/ikvm/runtime/ClassLoaderWrapper.cs,v retrieving revision 1.226 retrieving revision 1.227 diff -C2 -d -r1.226 -r1.227 *** ClassLoaderWrapper.cs 24 Jun 2014 09:44:37 -0000 1.226 --- ClassLoaderWrapper.cs 24 Jun 2014 10:32:16 -0000 1.227 *************** *** 358,362 **** if (className.StartsWith("java.", StringComparison.Ordinal)) { ! throw new SecurityException("Prohibited package name: " + className.Substring(0, className.LastIndexOf('.'))); } } --- 358,362 ---- if (className.StartsWith("java.", StringComparison.Ordinal)) { ! throw new JavaSecurityException("Prohibited package name: " + className.Substring(0, className.LastIndexOf('.'))); } } |