Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/ikvm-fork.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjfrijters <jfrijters>2014-06-24 14:32:16 +0400
committerjfrijters <jfrijters>2014-06-24 14:32:16 +0400
commita934063be05498e3eb3074b2f89a6e1733d11988 (patch)
treed074f5713d4d227e72d5fc0725068e96b0c6f092
parent6045cb74a4b1ecfce2449b0eeb79524ab2a6c1f4 (diff)
Fixed regression introduced by previous commit. We should not introduce SecurityException, because it conflicts with System.Security.SecurityException.
-rw-r--r--runtime/ClassLoaderWrapper.cs2
-rw-r--r--runtime/JavaException.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/ClassLoaderWrapper.cs b/runtime/ClassLoaderWrapper.cs
index b3317493..19a52882 100644
--- a/runtime/ClassLoaderWrapper.cs
+++ b/runtime/ClassLoaderWrapper.cs
@@ -357,7 +357,7 @@ namespace IKVM.Internal
{
if (className.StartsWith("java.", StringComparison.Ordinal))
{
- throw new SecurityException("Prohibited package name: " + className.Substring(0, className.LastIndexOf('.')));
+ throw new JavaSecurityException("Prohibited package name: " + className.Substring(0, className.LastIndexOf('.')));
}
}
diff --git a/runtime/JavaException.cs b/runtime/JavaException.cs
index 3a3869bb..e2a1d8e3 100644
--- a/runtime/JavaException.cs
+++ b/runtime/JavaException.cs
@@ -217,9 +217,9 @@ sealed class UnsupportedClassVersionError : ClassFormatError
#endif
}
-sealed class SecurityException : RetargetableJavaException
+sealed class JavaSecurityException : RetargetableJavaException
{
- internal SecurityException(string msg)
+ internal JavaSecurityException(string msg)
: base(msg)
{
}