Author: mturk Date: Mon Apr 25 11:06:49 2011 New Revision: 1096456 URL: http://svn.apache.org/viewvc?rev=1096456&view=rev Log: Use new exception classes
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h commons/sandbox/runtime/trunk/src/main/native/os/unix/execmem.c commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c commons/sandbox/runtime/trunk/src/main/native/os/unix/semaphore.c commons/sandbox/runtime/trunk/src/main/native/os/unix/shmem.c commons/sandbox/runtime/trunk/src/main/native/os/win32/execmem.c commons/sandbox/runtime/trunk/src/main/native/os/win32/procmutex.c commons/sandbox/runtime/trunk/src/main/native/os/win32/semaphore.c commons/sandbox/runtime/trunk/src/main/native/os/win32/shmem.c commons/sandbox/runtime/trunk/src/main/native/shared/array.c commons/sandbox/runtime/trunk/src/main/native/shared/constptr.c commons/sandbox/runtime/trunk/src/main/native/shared/error.c commons/sandbox/runtime/trunk/src/main/native/shared/iofd.c commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c commons/sandbox/runtime/trunk/src/main/native/shared/sliceptr.c Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h (original) +++ commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h Mon Apr 25 11:06:49 2011 @@ -36,31 +36,22 @@ /* Exception class enums */ enum { - ACR_EX_EGENERAL, /* java/lang/Exception */ ACR_EX_ERUNTIME, /* java/lang/RuntimeException */ ACR_EX_ENOMEM, /* java/lang/OutOfMemoryError */ ACR_EX_ENULL, /* java/lang/NullPointerException */ - ACR_EX_EACCES, /* java/lang/IllegalAccessException */ - ACR_EX_EINVAL, /* java/lang/IllegalArgumentException */ - ACR_EX_EISTATE, /* java/lang/IllegalStateException */ - ACR_EX_EINDEX, /* java/lang/IndexOutOfBoundsException */ - ACR_EX_EAINDEX, /* java/lang/ArrayIndexOutOfBoundsException */ - ACR_EX_ECCAST, /* java/lang/ClassCastException */ - ACR_EX_EINSTANCE, /* java/lang/InstantiationException */ - ACR_EX_EINTERNAL, /* java/lang/InternalError */ - ACR_EX_ESECURITY, /* java/lang/SecurityException */ - ACR_EX_ULINK, /* java/lang/UnsatisfiedLinkError */ - ACR_EX_ENOTIMPL, /* java/lang/UnsupportedOperationException */ - ACR_EX_EIO, /* java/io/IOException */ - ACR_EX_EINTR, /* java/io/InterruptedIOException */ - ACR_EX_ENOTFOUND, /* java/io/FileNotFoundException */ - ACR_EX_ESYNC, /* java/io/SyncFailedException */ - ACR_EX_ESOCK, /* java/net/SocketException */ - ACR_EX_EEXIST, /* exception/AlreadyExistsException */ - ACR_EX_ENOENT, /* exception/NoSuchObjectException */ - ACR_EX_ESYS, /* exception/SystemException */ - ACR_EX_ETIMEOUT, /* exception/TimeoutException */ - ACR_EX_UNSUPPORTED, /* exception/UnsupportedOperatingSystemException */ + ACR_EX_ENOSYS, /* java/lang/UnsupportedOperationException */ + + ACR_EX_EACCES, /* AccessDeniedException */ + ACR_EX_EEXIST, /* AlreadyExistsException */ + ACR_EX_EINVAL, /* InvalidArgumentException */ + ACR_EX_EBADF, /* InvalidDescriptorException */ + ACR_EX_ERANGE, /* InvalidRangeException */ + ACR_EX_ENAMETOOLONG, /* NameTooLongException */ + ACR_EX_ENOENT, /* NoSuchObjectException */ + ACR_EX_ENOTIMPL, /* OperationNotImplementedException */ + ACR_EX_EPERM, /* OperationNotPermittedException */ + ACR_EX_TIMEOUT, /* TimeoutException */ + ACR_EX_ESYS, /* SystemException */ ACR_EX_LEN }; Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/execmem.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/execmem.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/unix/execmem.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/unix/execmem.c Mon Apr 25 11:06:49 2011 @@ -40,10 +40,8 @@ ACR_JNI_EXPORT(jobject, ExecutableMemory { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "PosixExecutableMemoryImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/unix/procmutex.c Mon Apr 25 11:06:49 2011 @@ -93,10 +93,8 @@ ACR_JNI_EXPORT(jobject, MutexImpl, init0 { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000), (jint)_DEFAULT_MUTEX_TYPE); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "PosixMutexImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000), (jint)_DEFAULT_MUTEX_TYPE); Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/semaphore.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/semaphore.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/unix/semaphore.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/unix/semaphore.c Mon Apr 25 11:06:49 2011 @@ -47,10 +47,8 @@ ACR_JNI_EXPORT(jobject, SemaphoreImpl, i { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "PosixSemaphoreImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); @@ -94,10 +92,7 @@ ACR_UNX_EXPORT(jlong, PosixSemaphore, cr WITH_CSTR(name) { sp = sem_open(J2S(name), O_CREAT | O_EXCL, 0660, value); if (sp == SEM_FAILED) { - if (errno == ENAMETOOLONG) - ACR_THROW(ACR_EX_EINVAL, 0); - else - ACR_THROW_BY_ERRNO(); + ACR_THROW_BY_ERRNO(); } } DONE_WITH_STR(name); @@ -112,10 +107,7 @@ ACR_UNX_EXPORT(jlong, PosixSemaphore, op WITH_CSTR(name) { sp = sem_open(J2S(name), O_RDWR, 0, 0); if (sp == SEM_FAILED) { - if (errno == ENAMETOOLONG) - ACR_THROW(ACR_EX_EINVAL, 0); - else - ACR_THROW_BY_ERRNO(); + ACR_THROW_BY_ERRNO(); } } DONE_WITH_STR(name); Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/shmem.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/shmem.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/unix/shmem.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/unix/shmem.c Mon Apr 25 11:06:49 2011 @@ -56,10 +56,8 @@ ACR_JNI_EXPORT(jobject, ShmImpl, init0)( { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "PosixShmImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); @@ -83,7 +81,7 @@ ACR_UNX_EXPORT(jint, SysVShm, create0)(J } skey = ftok(J2S(name), 'a'); if (skey == (key_t)-1) { - ACR_THROW_SYS_ERROR(); + ACR_THROW_BY_ERRNO(); goto cleanup; } /* Write our header to shadow file @@ -95,7 +93,7 @@ ACR_UNX_EXPORT(jint, SysVShm, create0)(J hdr.magic = ACR_SHM_MAGIC; hdr.length = realsize; if (r_write(fd, (const void *)&hdr, nbytes) == -1) { - ACR_THROW_SYS_ERROR(); + ACR_THROW_BY_ERRNO(); goto cleanup; } sd = shmget(skey, realsize, SHM_R | SHM_W | IPC_CREAT | IPC_EXCL); @@ -133,12 +131,12 @@ ACR_UNX_EXPORT(jint, SysVShm, open0)(JNI rd = r_read(fd, (void *)&hdr, nbytes); if (rd != nbytes) { /* Wrong format */ - ACR_THROW(ACR_EX_ESYS, EBADF); + ACR_THROW(ACR_EX_EBADF, 0); goto cleanup; } if (hdr.magic != ACR_SHM_MAGIC) { /* Not created by us or corrupted */ - ACR_THROW(ACR_EX_ESYS, EBADF); + ACR_THROW(ACR_EX_EBADF, 0); goto cleanup; } else { Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/execmem.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/execmem.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/win32/execmem.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/execmem.c Mon Apr 25 11:06:49 2011 @@ -38,10 +38,8 @@ ACR_JNI_EXPORT(jobject, ExecutableMemory { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "WindowsExecutableMemoryImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/procmutex.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/procmutex.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/win32/procmutex.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/procmutex.c Mon Apr 25 11:06:49 2011 @@ -37,10 +37,8 @@ ACR_JNI_EXPORT(jobject, MutexImpl, init0 { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "WindowsMutexImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/semaphore.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/semaphore.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/win32/semaphore.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/semaphore.c Mon Apr 25 11:06:49 2011 @@ -37,10 +37,8 @@ ACR_JNI_EXPORT(jobject, SemaphoreImpl, i { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "WindowsSemaphoreImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/shmem.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/shmem.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/win32/shmem.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/shmem.c Mon Apr 25 11:06:49 2011 @@ -44,10 +44,8 @@ ACR_JNI_EXPORT(jobject, ShmImpl, init0)( { if (_clazzn.u == 1) return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); - if (AcrLoadClass(env, &_clazzn, 0) != 0) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "WindowsShmImpl not initialized"); + if (AcrLoadClass(env, &_clazzn, 0) != 0) return 0; - } R_LOAD_METHOD(0000, 0); _clazzn.u = 1; return (*env)->NewObject(env, _clazzn.i, J4MID(0000)); Modified: commons/sandbox/runtime/trunk/src/main/native/shared/array.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/array.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/shared/array.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/shared/array.c Mon Apr 25 11:06:49 2011 @@ -126,13 +126,14 @@ ACR_UTIL_EXPORT(jint, Array, memcmp0)(JN { jbyte *scp; jbyte *dcp; - jint srcLen; - jint dstLen; jint srcOff = srcPos * srcSiz; jint dstOff = dstPos * dstSiz; jint nbytes = length * srcSiz; jint rv; +#if 0 + jint srcLen; + jint dstLen; srcLen = (jint)(*env)->GetArrayLength(env, src); dstLen = (jint)(*env)->GetArrayLength(env, dst); if ((length > (srcLen - srcPos)) || @@ -140,7 +141,7 @@ ACR_UTIL_EXPORT(jint, Array, memcmp0)(JN ACR_THROW(ACR_EX_EAINDEX, 0); return -1; } - +#endif scp = (*env)->GetPrimitiveArrayCritical(env, src, 0); if (scp == 0) return -1; Modified: commons/sandbox/runtime/trunk/src/main/native/shared/constptr.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/constptr.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/shared/constptr.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/shared/constptr.c Mon Apr 25 11:06:49 2011 @@ -60,7 +60,6 @@ AcrNewConstPointer(JNI_STDENV, void *ptr jobject po; if (!CLAZZ_LOADED) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "ConstPointer not initialized"); return 0; } po = (*env)->NewObject(env, _clazzn.i, J4MID(0000), P2J(ptr), (jlong)len); Modified: commons/sandbox/runtime/trunk/src/main/native/shared/error.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/error.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/shared/error.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/shared/error.c Mon Apr 25 11:06:49 2011 @@ -30,31 +30,22 @@ static struct { jclass clazz; const char *name; } _throw_classes[ACR_EX_LEN] = { - { 0, "java/lang/Exception" }, { 0, "java/lang/RuntimeException" }, - { 0, "java/lang/OutOfMemoryError" }, - { 0, "java/lang/NullPointerException" }, - { 0, "java/lang/IllegalAccessException" }, - { 0, "java/lang/IllegalArgumentException" }, - { 0, "java/lang/IllegalStateException" }, - { 0, "java/lang/IndexOutOfBoundsException" }, - { 0, "java/lang/ArrayIndexOutOfBoundsException" }, - { 0, "java/lang/ClassCastException" }, - { 0, "java/lang/InstantiationException" }, - { 0, "java/lang/InternalError" }, - { 0, "java/lang/SecurityException" }, - { 0, "java/lang/UnsatisfiedLinkError" }, - { 0, "java/lang/UnsupportedOperationException" }, - { 0, "java/io/IOException" }, - { 0, "java/io/InterruptedIOException" }, - { 0, "java/io/FileNotFoundException" }, - { 0, "java/io/SyncFailedException" }, - { 0, "java/net/SocketException" }, - { 0, ACR_CLASS_PATH "AlreadyExistsException" }, - { 0, ACR_CLASS_PATH "NoSuchObjectException" }, - { 0, ACR_CLASS_PATH "SystemException" }, - { 0, ACR_CLASS_PATH "TimeoutException" }, - { 0, ACR_CLASS_PATH "UnsupportedOperatingSystemException" } + { 0, "java/lang/OutOfMemoryError" }, /* ENOMEM */ + { 0, "java/lang/NullPointerException" }, /* EISNULL */ + { 0, "java/lang/UnsupportedOperationException" }, /* ENOSYS */ + + { 0, ACR_CLASS_PATH "AccessDeniedException" }, /* EACCESS */ + { 0, ACR_CLASS_PATH "AlreadyExistsException" }, /* EEXIST */ + { 0, ACR_CLASS_PATH "InvalidArgumentException" }, /* EINVAL */ + { 0, ACR_CLASS_PATH "InvalidDescriptorException" }, /* EBADF */ + { 0, ACR_CLASS_PATH "InvalidRangeException" }, /* ERANGE */ + { 0, ACR_CLASS_PATH "NameTooLongException" }, /* ENAMETOOLONG */ + { 0, ACR_CLASS_PATH "NoSuchObjectException" }, /* ENOENT */ + { 0, ACR_CLASS_PATH "OperationNotImplementedException" }, /* ENOTIMPL */ + { 0, ACR_CLASS_PATH "OperationNotPermittedException" }, /* EPERM */ + { 0, ACR_CLASS_PATH "TimeoutException" }, /* ETIMEOUT */ + { 0, ACR_CLASS_PATH "SystemException" } }; static const char *const _canon_errors[] = { @@ -755,16 +746,28 @@ AcrThrowByStatus(JNI_STDENV, int err, co if (ACR_STATUS_IS_EEXIST(err)) cls = ACR_EX_EEXIST; - else if (ACR_STATUS_IS_EEXIST(ENOENT)) + else if (ACR_STATUS_IS_EEXIST(err)) cls = ACR_EX_ENOENT; - else if (ACR_STATUS_IS_EACCES(EACCES)) + else if (ACR_STATUS_IS_EACCES(err)) cls = ACR_EX_EACCES; - else if (ACR_STATUS_IS_EACCES(ENOMEM)) + else if (ACR_STATUS_IS_ENOMEM(err)) cls = ACR_EX_ENOMEM; - else if (ACR_STATUS_IS_EACCES(EINVAL)) + else if (ACR_STATUS_IS_EINVAL(err)) cls = ACR_EX_EINVAL; - else if (err == ENOSYS) + else if (ACR_STATUS_IS_TIMEUP(err)) + cls = ACR_EX_TIMEOUT; + else if (err == ACR_EPERM) + cls = ACR_EX_EPERM; + else if (err == ACR_ENOSYS) + cls = ACR_EX_ENOSYS; + else if (err == ACR_ENOTIMPL) cls = ACR_EX_ENOTIMPL; + else if (err == ACR_ENAMETOOLONG) + cls = ACR_EX_ENAMETOOLONG; + else if (err == ACR_ERANGE) + cls = ACR_EX_ERANGE; + else if (err == ACR_EBADF) + cls = ACR_EX_EBADF; AcrThrow(env, cls, msg); } Modified: commons/sandbox/runtime/trunk/src/main/native/shared/iofd.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/iofd.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/shared/iofd.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/shared/iofd.c Mon Apr 25 11:06:49 2011 @@ -171,7 +171,6 @@ AcrNewFileDescriptor(JNI_STDENV, int fd, jobject fo; if (!CLAZZ_LOADED) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "FileDescriptor not initialized"); return 0; } fo = (*env)->NewObject(env, _clazzn.i, J4MID(0001), fd); Modified: commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c Mon Apr 25 11:06:49 2011 @@ -80,7 +80,6 @@ AcrNewHeapPointer(JNI_STDENV, void *ptr, jobject po; if (!CLAZZ_LOADED) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "HeapPointer not initialized"); return 0; } po = (*env)->NewObject(env, _clazzn.i, J4MID(0000), P2J(ptr), (jlong)len); @@ -98,7 +97,6 @@ void * AcrGetPointer(JNI_STDARGS) { if (!CLAZZ_LOADED) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "Pointer not initialized"); return 0; } if (UNSAFE_HAS_OFF(0000)) { @@ -117,7 +115,6 @@ int AcrSetPointer(JNI_STDARGS, void *val) { if (!CLAZZ_LOADED) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "Pointer not initialized"); return -1; } if (UNSAFE_HAS_OFF(0000)) { @@ -138,7 +135,6 @@ int AcrSetPointerEx(JNI_STDARGS, void *val, size_t len) { if (!CLAZZ_LOADED) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "Pointer not initialized"); return -1; } if (UNSAFE_HAS_OFF(0000) && UNSAFE_HAS_OFF(0001)) { Modified: commons/sandbox/runtime/trunk/src/main/native/shared/sliceptr.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/sliceptr.c?rev=1096456&r1=1096455&r2=1096456&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/shared/sliceptr.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/shared/sliceptr.c Mon Apr 25 11:06:49 2011 @@ -60,7 +60,6 @@ AcrNewSlicePointer(JNI_STDENV, void *ptr jobject po; if (!CLAZZ_LOADED) { - ACR_THROW_MSG(ACR_EX_EINSTANCE, "SlicePointer not initialized"); return 0; } po = (*env)->NewObject(env, _clazzn.i, J4MID(0000), P2J(ptr), (jlong)len);