You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/05/26 08:25:37 UTC
svn commit: r778567 - in /commons/sandbox/runtime/trunk/src/main/native:
os/win32/wusec.c shared/fco.c
Author: mturk
Date: Tue May 26 06:25:36 2009
New Revision: 778567
URL: http://svn.apache.org/viewvc?rev=778567&view=rev
Log:
Throw exception if JNIEnv is provided
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c
commons/sandbox/runtime/trunk/src/main/native/shared/fco.c
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c?rev=778567&r1=778566&r2=778567&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/wusec.c Tue May 26 06:25:36 2009
@@ -297,14 +297,18 @@
{
PSID pSID = NULL;
- if (sSID && IsValidSid(sSID)) {
+ if (IsValidSid(sSID)) {
DWORD dwLen = GetLengthSid(sSID);
pSID = (PSID) ACR_Calloc(_E, THROW_NMARK, dwLen);
if (!pSID)
return NULL;
if (!CopySid(dwLen, pSID, sSID)) {
+ int ec = ACR_GET_OS_ERROR();
free(pSID);
pSID = NULL;
+ if (_E) {
+ ACR_ThrowException(_E, THROW_NMARK, ACR_EX_OSERR, ec);
+ }
}
}
return pSID;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/fco.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/fco.c?rev=778567&r1=778566&r2=778567&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/fco.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/fco.c Tue May 26 06:25:36 2009
@@ -33,7 +33,7 @@
J_DECLARE_CLAZZ = {
NULL,
NULL,
- ACR_CLASS_PATH "io/File"
+ ACR_IO_CLASS_PATH "File"
};
J_DECLARE_M_ID(0000) = {