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 2010/10/20 07:28:27 UTC
svn commit: r1024527 -
/commons/proper/daemon/trunk/src/native/windows/src/javajni.c
Author: mturk
Date: Wed Oct 20 05:28:27 2010
New Revision: 1024527
URL: http://svn.apache.org/viewvc?rev=1024527&view=rev
Log:
DAEMON-163 Code cleanup.
Modified:
commons/proper/daemon/trunk/src/native/windows/src/javajni.c
Modified: commons/proper/daemon/trunk/src/native/windows/src/javajni.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/javajni.c?rev=1024527&r1=1024526&r2=1024527&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/javajni.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/javajni.c Wed Oct 20 05:28:27 2010
@@ -392,10 +392,7 @@ static DWORD __apxMultiSzToJvmOptions(AP
l = __apxGetMultiSzLengthA(lpString, &n);
}
n += nExtra;
- if (IS_INVALID_HANDLE(hPool))
- buff = apxPoolAlloc(hPool, (n + 1) * sizeof(JavaVMOption) + (l + 1));
- else
- buff = apxAlloc((n + 1) * sizeof(JavaVMOption) + (l + 1));
+ buff = apxPoolAlloc(hPool, (n + 1) * sizeof(JavaVMOption) + (l + 1));
*lppArray = (JavaVMOption *)buff;
p = (LPSTR)(buff + (n + 1) * sizeof(JavaVMOption));
@@ -914,7 +911,7 @@ apxJavaStart(LPAPXJAVA_THREADARGS pArgs)
if (lstrcmpA(lpJava->clWorker.sClazz, "java/lang/System")) {
/* Give some time to initialize the thread
* Unless we are calling System.exit(0).
- * This will be hanled by _onexit hook.
+ * This will be hanled by _onexit hook.
*/
Sleep(1000);
}