Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -60,8 +60,8 @@ abstract class RetargetableJavaException : ApplicationException
// hiding exceptions caused by coding errors in the IKVM code.
sealed class ClassLoadingException : RetargetableJavaException
{
internal ClassLoadingException(Exception x)
: base(x.Message, x)
internal ClassLoadingException(Exception x, string className)
: base(className, x)
{
}
@@ -70,7 +70,7 @@ sealed class ClassLoadingException : RetargetableJavaException
{
if (!(InnerException is java.lang.Error) && !(InnerException is java.lang.RuntimeException))
{
return new java.lang.NoClassDefFoundError(InnerException.Message).initCause(InnerException);
return new java.lang.NoClassDefFoundError(Message.Replace('.', '/')).initCause(InnerException);
}
return InnerException;
}