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/04/21 13:28:16 UTC
svn commit: r767117 - in /commons/sandbox/runtime/trunk/src:
main/native/os/darwin/os.c main/native/os/hpux/os.c
main/native/os/linux/os.c main/native/os/solaris/os.c
main/native/os/win32/os.c test/org/apache/commons/runtime/TestFile.java
Author: mturk
Date: Tue Apr 21 11:28:16 2009
New Revision: 767117
URL: http://svn.apache.org/viewvc?rev=767117&view=rev
Log:
Fix OS.IS_
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java
Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c?rev=767117&r1=767116&r2=767117&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c Tue Apr 21 11:28:16 2009
@@ -25,7 +25,7 @@
ACR_JNI_EXPORT_DECLARE(jboolean, OS, is)(ACR_JNISTDARGS, jint type)
{
UNREFERENCED_STDARGS;
- if ((type & ACR_OS_UNIX) == ACR_OS_UNIX)
+ if (type == ACR_OS_UNIX)
return JNI_TRUE;
else if (type == ACR_OS_DARWIN)
return JNI_TRUE;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c?rev=767117&r1=767116&r2=767117&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c Tue Apr 21 11:28:16 2009
@@ -25,7 +25,7 @@
ACR_JNI_EXPORT_DECLARE(jboolean, OS, is)(ACR_JNISTDARGS, jint type)
{
UNREFERENCED_STDARGS;
- if ((type & ACR_OS_UNIX) == ACR_OS_UNIX)
+ if (type == ACR_OS_UNIX)
return JNI_TRUE;
else if (type == ACR_OS_HPUX)
return JNI_TRUE;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c?rev=767117&r1=767116&r2=767117&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c Tue Apr 21 11:28:16 2009
@@ -25,7 +25,7 @@
ACR_JNI_EXPORT_DECLARE(jboolean, OS, is)(ACR_JNISTDARGS, jint type)
{
UNREFERENCED_STDARGS;
- if ((type & ACR_OS_UNIX) == ACR_OS_UNIX)
+ if (type == ACR_OS_UNIX)
return JNI_TRUE;
else if (type == ACR_OS_LINUX)
return JNI_TRUE;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c?rev=767117&r1=767116&r2=767117&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c Tue Apr 21 11:28:16 2009
@@ -25,7 +25,7 @@
ACR_JNI_EXPORT_DECLARE(jboolean, OS, is)(ACR_JNISTDARGS, jint type)
{
UNREFERENCED_STDARGS;
- if ((type & ACR_OS_UNIX) == ACR_OS_UNIX)
+ if (type == ACR_OS_UNIX)
return JNI_TRUE;
else if (type == ACR_OS_SOLARIS)
return JNI_TRUE;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c?rev=767117&r1=767116&r2=767117&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c Tue Apr 21 11:28:16 2009
@@ -33,7 +33,7 @@
return JNI_TRUE;
else
#endif
- if ((type & ACR_OS_WINDOWS) == ACR_OS_WINDOWS)
+ if (type == ACR_OS_WINDOWS)
return JNI_TRUE;
else if (type == ACR_OS_WOW64) {
BOOL is = FALSE;
Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java?rev=767117&r1=767116&r2=767117&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestFile.java Tue Apr 21 11:28:16 2009
@@ -57,7 +57,10 @@
f = new File("C:\\Windows\\win.ini");
FileType t = f.getFileType();
- assertEquals("Type", FileType.REG, t);
+ if (OS.IS_SOLARIS)
+ assertEquals("Type", FileType.LNK, t);
+ else
+ assertEquals("Type", FileType.REG, t);
}
public void testFileTypeCreated()