Author: mturk
Date: Sat Jul 16 13:54:50 2011
New Revision: 1147428
URL: http://svn.apache.org/viewvc?rev=1147428&view=rev
Log:
Use better name for OORE
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr/error.h
commons/sandbox/runtime/trunk/src/main/native/shared/error.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=1147428&r1=1147427&r2=1147428&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 Sat Jul
16 13:54:50 2011
@@ -61,7 +61,7 @@ enum {
ACR_EX_ESYS, /* SystemException */
ACR_EX_ENET, /* NetworkException */
ACR_EX_EOVERFLOW, /* OverflowException */
- ACR_EX_ENOBUFS, /* OutOfResourcesException */
+ ACR_EX_ENORES, /* OutOfResourcesException */
ACR_EX_ECONNABORTED, /* ConnectionAbortedException */
ACR_EX_ECONNRESET, /* ConnectionResetException */
ACR_EX_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=1147428&r1=1147427&r2=1147428&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/error.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/error.c Sat Jul 16
13:54:50 2011
@@ -36,8 +36,8 @@ static struct {
{ 0, "java/lang/OutOfMemoryError" }, /* ENOMEM
*/
{ 0, "java/lang/NullPointerException" }, /* EISNULL
*/
{ 0, "java/lang/UnsupportedOperationException" }, /* ENOSYS
*/
- { 0, "java/io/IOException" }, /* EX_EIO
*/
- { 0, "java/net/SocketException" }, /* EX_ESOCK
*/
+ { 0, "java/io/IOException" }, /* EIO
*/
+ { 0, "java/net/SocketException" }, /* ESOCK
*/
{ 0, ACR_IO_CP "InvalidDescriptorException" }, /* EBADF
*/
{ 0, ACR_CLASS_PATH "AccessDeniedException" }, /* EACCESS
*/
@@ -52,10 +52,10 @@ static struct {
{ 0, ACR_IO_CP "OperationWouldBlockException" }, /*
EWOULDBLOCK */
{ 0, ACR_NET_CP "IllegalBlockingModeException" }, /*
EILLEGALBLOCK */
{ 0, ACR_CLASS_PATH "TimeoutException" }, /* ETIMEOUT
*/
- { 0, ACR_CLASS_PATH "SystemException" }, /* EX_ESYS
*/
- { 0, ACR_NET_CP "NetworkException" }, /* EX_ENET
*/
+ { 0, ACR_CLASS_PATH "SystemException" }, /* ESYS
*/
+ { 0, ACR_NET_CP "NetworkException" }, /* ENET
*/
{ 0, ACR_CLASS_PATH "OverflowException" }, /*
EOVERFLOW */
- { 0, ACR_CLASS_PATH "OutOfResourcesException" }, /* ENOBUFS
*/
+ { 0, ACR_CLASS_PATH "OutOfResourcesException" }, /* ENORES
*/
{ 0, ACR_NET_CP "ConnectionAbortedException" }, /*
ECONNABORTED */
{ 0, ACR_NET_CP "ConnectionResetException" } /*
ECONNRESET */
};
@@ -779,7 +779,7 @@ AcrThrowByError(JNI_STDENV, int def, int
else if (ACR_STATUS_IS_ECONNABORTED(err))
cls = ACR_EX_ECONNABORTED;
else if (ACR_STATUS_IS_EMFILE(err) || err == ACR_ENOBUFS)
- cls = ACR_EX_ENOBUFS;
+ cls = ACR_EX_ENORES;
else if (err == ACR_EPERM)
cls = ACR_EX_EPERM;
else if (err == ACR_ENOSYS)
