Author: mturk
Date: Thu May 19 16:22:42 2011
New Revision: 1124985
URL: http://svn.apache.org/viewvc?rev=1124985&view=rev
Log:
Use full Id so we can have +64K of pipes
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c
commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c?rev=1124985&r1=1124984&r2=1124985&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/util.c Thu May 19
16:22:42 2011
@@ -255,8 +255,8 @@ AcrPipeNameFromIdA(DWORD dwPid, DWORD dw
if (lpszName == 0 || dwNameLength == 0)
return ISIZEOF(PIPE_FMT);
return _snprintf(lpszName, dwNameLength,
- "\\\\.\\pipe\\%08x-0000-%04x-0000-000000000000",
- dwPid, dwId & 0xffff);
+ "\\\\.\\pipe\\%08x-0000-0000-0000-0000%08x",
+ dwPid, dwId);
}
int
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c?rev=1124985&r1=1124984&r2=1124985&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c Thu May 19
16:22:42 2011
@@ -299,9 +299,8 @@ AcrLoadClass(JNI_STDENV, JAVA_C_ID *claz
goto failed;
}
clazz->i = (jclass)(*env)->NewGlobalRef(env, c);
- if (clazz->i == 0) {
+ if (clazz->i == 0)
goto failed;
- }
(*env)->DeleteLocalRef(env, c);
if (init_array != 0) {
@@ -318,9 +317,9 @@ AcrLoadClass(JNI_STDENV, JAVA_C_ID *claz
goto failed;
}
clazz->a = (jclass)(*env)->NewGlobalRef(env, c);
- if (clazz->a == 0) {
+ if (clazz->a == 0)
goto failed;
- }
+ (*env)->DeleteLocalRef(env, c);
}
else {
/* We don't need Objec[][] arrays */
