paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-08 01:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

* pas2jni: Fixed exception handling.

Browse Source 
git-svn-id: trunk@41396 -
This commit is contained in:
yury 2019-02-20 13:04:49 +00:00
parent fa4596a08f
commit c0e1ec9121
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/pas2jni/writer.pas
View File

@ -2192,8 +2192,6 @@ begin
Fps.WriteLn('Result:=JNI_ERR;');
Fps.WriteLn('if vm^^.GetEnv(vm, @env, JNI_VERSION_1_6) <> JNI_OK then exit;');
Fps.WriteLn('CurJavaVM:=vm;');
Fps.WriteLn('_JavaExceptionClass:=env^^.FindClass(env, ''java/lang/Exception'');');
Fps.WriteLn('if _JavaExceptionClass = nil then exit;');
d:=TTypeDef.Create(nil, dtType);
try
@ -3006,8 +3004,6 @@ begin
Fps.DecI;
Fps.WriteLn('end;');
Fps.WriteLn;
Fps.WriteLn('var _JavaExceptionClass: jclass;');
Fps.WriteLn;
Fps.WriteLn('procedure _HandleJNIException(env: PJNIEnv);');
Fps.WriteLn('begin');
@ -3016,7 +3012,7 @@ begin
Fps.WriteLn(Format('%s.%s;', [p.OnExceptionProc.Parent.Name, p.OnExceptionProc.Name]), 1);
p.OnExceptionProc.SetNotUsed;
end;
Fps.WriteLn('env^^.ThrowNew(env, _JavaExceptionClass, PAnsiChar(Utf8Encode(Exception(ExceptObject).Message)));', 1);
Fps.WriteLn('env^^.ThrowNew(env, env^^.FindClass(env, ''java/lang/Exception''), PAnsiChar(Utf8Encode(Exception(ExceptObject).Message)));', 1);
Fps.WriteLn('end;');
Fps.WriteLn;