commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1094914 - in /commons/sandbox/runtime/trunk/src/main: java/org/apache/commons/runtime/Errno.java java/org/apache/commons/runtime/Status.java java/org/apache/commons/runtime/platform/windows/Security.java native/shared/error.c
Date Tue, 19 Apr 2011 07:47:01 GMT
Author: mturk
Date: Tue Apr 19 07:47:00 2011
New Revision: 1094914

URL: http://svn.apache.org/viewvc?rev=1094914&view=rev
Log:
Split Status to two classes

Added:
    commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Errno.java   (with
props)
Modified:
    commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Status.java
    commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Security.java
    commons/sandbox/runtime/trunk/src/main/native/shared/error.c

Added: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Errno.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Errno.java?rev=1094914&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Errno.java (added)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Errno.java Tue
Apr 19 07:47:00 2011
@@ -0,0 +1,333 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.runtime;
+
+/**
+ * Errno class.
+ *
+ * @since Runtime 1.0
+ *
+ */
+public final class Errno
+{
+
+    private Errno()
+    {
+        // No class instance
+    }
+    /*
+     * Get Platform dependent error codes.
+     */
+    private static native void init0(int[] i);
+
+    static {
+        int [] i = new int[128];
+        init0(i);
+
+        EPERM               = i[1];
+        ENOENT              = i[2];
+        ESRCH               = i[3];
+        EINTR               = i[4];
+        EIO                 = i[5];
+        ENXIO               = i[6];
+        E2BIG               = i[7];
+        ENOEXEC             = i[8];
+        EBADF               = i[9];
+        ECHILD              = i[10];
+        EDEADLK             = i[11];
+        ENOMEM              = i[12];
+        EACCES              = i[13];
+        EFAULT              = i[14];
+        ENOTBLK             = i[15];
+        EBUSY               = i[16];
+        EEXIST              = i[17];
+        EXDEV               = i[18];
+        ENODEV              = i[19];
+        ENOTDIR             = i[20];
+        EISDIR              = i[21];
+        EINVAL              = i[22];
+        ENFILE              = i[23];
+        EMFILE              = i[24];
+        ENOTTY              = i[25];
+        ETXTBSY             = i[26];
+        EFBIG               = i[27];
+        ENOSPC              = i[28];
+        ESPIPE              = i[29];
+        EROFS               = i[30];
+        EMLINK              = i[31];
+        EPIPE               = i[32];
+        EDOM                = i[33];
+        ERANGE              = i[34];
+        EAGAIN              = i[35];
+        EWOULDBLOCK         = i[36];
+        EINPROGRESS         = i[37];
+        EALREADY            = i[38];
+        ENOTSOCK            = i[39];
+        EDESTADDRREQ        = i[40];
+        EMSGSIZE            = i[41];
+        EPROTOTYPE          = i[42];
+        ENOPROTOOPT         = i[43];
+        EPROTONOSUPPORT     = i[44];
+        ESOCKTNOSUPPORT     = i[45];
+        EOPNOTSUPP          = i[46];
+        EPFNOSUPPORT        = i[47];
+        EAFNOSUPPORT        = i[48];
+        EADDRINUSE          = i[49];
+        EADDRNOTAVAIL       = i[50];
+        ENETDOWN            = i[51];
+        ENETUNREACH         = i[52];
+        ENETRESET           = i[53];
+        ECONNABORTED        = i[54];
+        ECONNRESET          = i[55];
+        ENOBUFS             = i[56];
+        EISCONN             = i[57];
+        ENOTCONN            = i[58];
+        ESHUTDOWN           = i[59];
+        ETOOMANYREFS        = i[60];
+        ETIMEDOUT           = i[61];
+        ECONNREFUSED        = i[62];
+        ELOOP               = i[63];
+        ENAMETOOLONG        = i[64];
+        EHOSTDOWN           = i[65];
+        EHOSTUNREACH        = i[66];
+        ENOTEMPTY           = i[67];
+        EPROCLIM            = i[68];
+        EUSERS              = i[69];
+        EDQUOT              = i[70];
+        ESTALE              = i[71];
+        EREMOTE             = i[72];
+        EBADRPC             = i[73];
+        ERPCMISMATCH        = i[74];
+        EPROGUNAVAIL        = i[75];
+        EPROGMISMATCH       = i[76];
+        EPROCUNAVAIL        = i[77];
+        ENOLCK              = i[78];
+        ENOSYS              = i[79];
+        EFTYPE              = i[80];
+        EAUTH               = i[81];
+        ENEEDAUTH           = i[82];
+        EIPSEC              = i[83];
+        ENOATTR             = i[84];
+        EILSEQ              = i[85];
+        ENOMEDIUM           = i[86];
+        EMEDIUMTYPE         = i[87];
+        EOVERFLOW           = i[88];
+        ECANCELED           = i[89];
+        EIDRM               = i[90];
+        ENOMSG              = i[91];
+
+    }
+
+    /* ACR CANONICAL ERROR VALUES */
+    /** Operation not permitted */
+    public static final int EPERM;
+    /** No such file or directory */
+    public static final int ENOENT;
+    /** No such process */
+    public static final int ESRCH;
+    /** Interrupted system call */
+    public static final int EINTR;
+    /** Input/output error */
+    public static final int EIO;
+    /** Device not configured */
+    public static final int ENXIO;
+    /** Argument list too long */
+    public static final int E2BIG;
+    /** Exec format error */
+    public static final int ENOEXEC;
+    /** Bad file descriptor */
+    public static final int EBADF;
+    /** No child processes */
+    public static final int ECHILD;
+    /** Resource deadlock avoided */
+    public static final int EDEADLK;
+    /** Cannot allocate memory */
+    public static final int ENOMEM;
+    /** Permission denied */
+    public static final int EACCES;
+    /** Bad address */
+    public static final int EFAULT;
+    /** Block device required */
+    public static final int ENOTBLK;
+    /** Device busy */
+    public static final int EBUSY;
+    /** File exists */
+    public static final int EEXIST;
+    /** Cross-device link */
+    public static final int EXDEV;
+    /** Operation not supported by device */
+    public static final int ENODEV;
+    /** Not a directory */
+    public static final int ENOTDIR;
+    /** Is a directory */
+    public static final int EISDIR;
+    /** Invalid argument */
+    public static final int EINVAL;
+    /** Too many open files in system */
+    public static final int ENFILE;
+    /** Too many open files */
+    public static final int EMFILE;
+    /** Inappropriate ioctl for device */
+    public static final int ENOTTY;
+    /** Text file busy */
+    public static final int ETXTBSY;
+    /** File too large */
+    public static final int EFBIG;
+    /** No space left on device */
+    public static final int ENOSPC;
+    /** Illegal seek */
+    public static final int ESPIPE;
+    /** Read-only file system */
+    public static final int EROFS;
+    /** Too many links */
+    public static final int EMLINK;
+    /** Broken pipe */
+    public static final int EPIPE;
+    /** Numerical argument out of domain */
+    public static final int EDOM;
+    /** Result too large */
+    public static final int ERANGE;
+    /** Resource temporarily unavailable */
+    public static final int EAGAIN;
+    /** Operation would block */
+    public static final int EWOULDBLOCK;
+    /** Operation now in progress */
+    public static final int EINPROGRESS;
+    /** Operation already in progress */
+    public static final int EALREADY;
+    /** Socket operation on non-socket */
+    public static final int ENOTSOCK;
+    /** Destination address required */
+    public static final int EDESTADDRREQ;
+    /** Message too long */
+    public static final int EMSGSIZE;
+    /** Protocol wrong type for socket */
+    public static final int EPROTOTYPE;
+    /** Protocol not available */
+    public static final int ENOPROTOOPT;
+    /** Protocol not supported */
+    public static final int EPROTONOSUPPORT;
+    /** Socket type not supported */
+    public static final int ESOCKTNOSUPPORT;
+    /** Operation not supported */
+    public static final int EOPNOTSUPP;
+    /** Protocol family not supported */
+    public static final int EPFNOSUPPORT;
+    /** Address family not supported by protocol family */
+    public static final int EAFNOSUPPORT;
+    /** Address already in use */
+    public static final int EADDRINUSE;
+    /** Can't assign requested address */
+    public static final int EADDRNOTAVAIL;
+    /** Network is down */
+    public static final int ENETDOWN;
+    /** Network is unreachable */
+    public static final int ENETUNREACH;
+    /** Network dropped connection on reset */
+    public static final int ENETRESET;
+    /** Software caused connection abort */
+    public static final int ECONNABORTED;
+    /** Connection reset by peer */
+    public static final int ECONNRESET;
+    /** No buffer space available */
+    public static final int ENOBUFS;
+    /** Socket is already connected */
+    public static final int EISCONN;
+    /** Socket is not connected */
+    public static final int ENOTCONN;
+    /** Can't send after socket shutdown */
+    public static final int ESHUTDOWN;
+    /** Too many references: can't splice */
+    public static final int ETOOMANYREFS;
+    /** Operation timed out */
+    public static final int ETIMEDOUT;
+    /** Connection refused */
+    public static final int ECONNREFUSED;
+    /** Too many levels of symbolic links */
+    public static final int ELOOP;
+    /** File name too long */
+    public static final int ENAMETOOLONG;
+    /** Host is down */
+    public static final int EHOSTDOWN;
+    /** No route to host */
+    public static final int EHOSTUNREACH;
+    /** Directory not empty */
+    public static final int ENOTEMPTY;
+    /** Too many processes */
+    public static final int EPROCLIM;
+    /** Too many users */
+    public static final int EUSERS;
+    /** Disk quota exceeded */
+    public static final int EDQUOT;
+    /** Stale NFS file handle */
+    public static final int ESTALE;
+    /** Too many levels of remote in path */
+    public static final int EREMOTE;
+    /** RPC struct is bad */
+    public static final int EBADRPC;
+    /** RPC version wrong */
+    public static final int ERPCMISMATCH;
+    /** RPC prog. not avail */
+    public static final int EPROGUNAVAIL;
+    /** Program version wrong */
+    public static final int EPROGMISMATCH;
+    /** Bad procedure for program */
+    public static final int EPROCUNAVAIL;
+    /** No locks available */
+    public static final int ENOLCK;
+    /** Function not implemented */
+    public static final int ENOSYS;
+    /** Inappropriate file type or format */
+    public static final int EFTYPE;
+    /** Authentication error */
+    public static final int EAUTH;
+    /** Need authenticator */
+    public static final int ENEEDAUTH;
+    /** IPsec processing failure */
+    public static final int EIPSEC;
+    /** Attribute not found */
+    public static final int ENOATTR;
+    /** Illegal byte sequence */
+    public static final int EILSEQ;
+    /** No medium found */
+    public static final int ENOMEDIUM;
+    /** Wrong Medium Type */
+    public static final int EMEDIUMTYPE;
+    /** Conversion overflow */
+    public static final int EOVERFLOW;
+    /** Operation canceled */
+    public static final int ECANCELED;
+    /** Identifier removed */
+    public static final int EIDRM;
+    /** No message of desired type */
+    public static final int ENOMSG;
+
+    /** Return the calling thread's last-error code value.
+     *
+     * The last-error code is maintained on a per-thread basis.
+     * Multiple threads do not overwrite each others's last-error code.
+     * Commons runtime uses it's own per-thread storage for
+     * last-error code.
+     */
+    public static native int get();
+
+    /** Return the calling thread's last-error message.
+     *
+     */
+    public static native String msg();
+    
+}

Propchange: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Errno.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Status.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Status.java?rev=1094914&r1=1094913&r2=1094914&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Status.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Status.java Tue
Apr 19 07:47:00 2011
@@ -22,300 +22,15 @@ package org.apache.commons.runtime;
  * @since Runtime 1.0
  *
  */
-public class Status
+public final class Status
 {
 
     private Status()
     {
         // No class instance
     }
-    /*
-     * Get Platform dependent error codes.
-     */
-    private static native void init0(int[] i);
-
-    static {
-        int [] i = new int[128];
-        init0(i);
-
-        OS_LAST_CANONERR    = i[0];
-        EPERM               = i[1];
-        ENOENT              = i[2];
-        ESRCH               = i[3];
-        EINTR               = i[4];
-        EIO                 = i[5];
-        ENXIO               = i[6];
-        E2BIG               = i[7];
-        ENOEXEC             = i[8];
-        EBADF               = i[9];
-        ECHILD              = i[10];
-        EDEADLK             = i[11];
-        ENOMEM              = i[12];
-        EACCES              = i[13];
-        EFAULT              = i[14];
-        ENOTBLK             = i[15];
-        EBUSY               = i[16];
-        EEXIST              = i[17];
-        EXDEV               = i[18];
-        ENODEV              = i[19];
-        ENOTDIR             = i[20];
-        EISDIR              = i[21];
-        EINVAL              = i[22];
-        ENFILE              = i[23];
-        EMFILE              = i[24];
-        ENOTTY              = i[25];
-        ETXTBSY             = i[26];
-        EFBIG               = i[27];
-        ENOSPC              = i[28];
-        ESPIPE              = i[29];
-        EROFS               = i[30];
-        EMLINK              = i[31];
-        EPIPE               = i[32];
-        EDOM                = i[33];
-        ERANGE              = i[34];
-        EAGAIN              = i[35];
-        EWOULDBLOCK         = i[36];
-        EINPROGRESS         = i[37];
-        EALREADY            = i[38];
-        ENOTSOCK            = i[39];
-        EDESTADDRREQ        = i[40];
-        EMSGSIZE            = i[41];
-        EPROTOTYPE          = i[42];
-        ENOPROTOOPT         = i[43];
-        EPROTONOSUPPORT     = i[44];
-        ESOCKTNOSUPPORT     = i[45];
-        EOPNOTSUPP          = i[46];
-        EPFNOSUPPORT        = i[47];
-        EAFNOSUPPORT        = i[48];
-        EADDRINUSE          = i[49];
-        EADDRNOTAVAIL       = i[50];
-        ENETDOWN            = i[51];
-        ENETUNREACH         = i[52];
-        ENETRESET           = i[53];
-        ECONNABORTED        = i[54];
-        ECONNRESET          = i[55];
-        ENOBUFS             = i[56];
-        EISCONN             = i[57];
-        ENOTCONN            = i[58];
-        ESHUTDOWN           = i[59];
-        ETOOMANYREFS        = i[60];
-        ETIMEDOUT           = i[61];
-        ECONNREFUSED        = i[62];
-        ELOOP               = i[63];
-        ENAMETOOLONG        = i[64];
-        EHOSTDOWN           = i[65];
-        EHOSTUNREACH        = i[66];
-        ENOTEMPTY           = i[67];
-        EPROCLIM            = i[68];
-        EUSERS              = i[69];
-        EDQUOT              = i[70];
-        ESTALE              = i[71];
-        EREMOTE             = i[72];
-        EBADRPC             = i[73];
-        ERPCMISMATCH        = i[74];
-        EPROGUNAVAIL        = i[75];
-        EPROGMISMATCH       = i[76];
-        EPROCUNAVAIL        = i[77];
-        ENOLCK              = i[78];
-        ENOSYS              = i[79];
-        EFTYPE              = i[80];
-        EAUTH               = i[81];
-        ENEEDAUTH           = i[82];
-        EIPSEC              = i[83];
-        ENOATTR             = i[84];
-        EILSEQ              = i[85];
-        ENOMEDIUM           = i[86];
-        EMEDIUMTYPE         = i[87];
-        EOVERFLOW           = i[88];
-        ECANCELED           = i[89];
-        EIDRM               = i[90];
-        ENOMSG              = i[91];
-
-    }
 
-    /* ACR CANONICAL ERROR VALUES */
-    /** Operation not permitted */
-    public static final int EPERM;
-    /** No such file or directory */
-    public static final int ENOENT;
-    /** No such process */
-    public static final int ESRCH;
-    /** Interrupted system call */
-    public static final int EINTR;
-    /** Input/output error */
-    public static final int EIO;
-    /** Device not configured */
-    public static final int ENXIO;
-    /** Argument list too long */
-    public static final int E2BIG;
-    /** Exec format error */
-    public static final int ENOEXEC;
-    /** Bad file descriptor */
-    public static final int EBADF;
-    /** No child processes */
-    public static final int ECHILD;
-    /** Resource deadlock avoided */
-    public static final int EDEADLK;
-    /** Cannot allocate memory */
-    public static final int ENOMEM;
-    /** Permission denied */
-    public static final int EACCES;
-    /** Bad address */
-    public static final int EFAULT;
-    /** Block device required */
-    public static final int ENOTBLK;
-    /** Device busy */
-    public static final int EBUSY;
-    /** File exists */
-    public static final int EEXIST;
-    /** Cross-device link */
-    public static final int EXDEV;
-    /** Operation not supported by device */
-    public static final int ENODEV;
-    /** Not a directory */
-    public static final int ENOTDIR;
-    /** Is a directory */
-    public static final int EISDIR;
-    /** Invalid argument */
-    public static final int EINVAL;
-    /** Too many open files in system */
-    public static final int ENFILE;
-    /** Too many open files */
-    public static final int EMFILE;
-    /** Inappropriate ioctl for device */
-    public static final int ENOTTY;
-    /** Text file busy */
-    public static final int ETXTBSY;
-    /** File too large */
-    public static final int EFBIG;
-    /** No space left on device */
-    public static final int ENOSPC;
-    /** Illegal seek */
-    public static final int ESPIPE;
-    /** Read-only file system */
-    public static final int EROFS;
-    /** Too many links */
-    public static final int EMLINK;
-    /** Broken pipe */
-    public static final int EPIPE;
-    /** Numerical argument out of domain */
-    public static final int EDOM;
-    /** Result too large */
-    public static final int ERANGE;
-    /** Resource temporarily unavailable */
-    public static final int EAGAIN;
-    /** Operation would block */
-    public static final int EWOULDBLOCK;
-    /** Operation now in progress */
-    public static final int EINPROGRESS;
-    /** Operation already in progress */
-    public static final int EALREADY;
-    /** Socket operation on non-socket */
-    public static final int ENOTSOCK;
-    /** Destination address required */
-    public static final int EDESTADDRREQ;
-    /** Message too long */
-    public static final int EMSGSIZE;
-    /** Protocol wrong type for socket */
-    public static final int EPROTOTYPE;
-    /** Protocol not available */
-    public static final int ENOPROTOOPT;
-    /** Protocol not supported */
-    public static final int EPROTONOSUPPORT;
-    /** Socket type not supported */
-    public static final int ESOCKTNOSUPPORT;
-    /** Operation not supported */
-    public static final int EOPNOTSUPP;
-    /** Protocol family not supported */
-    public static final int EPFNOSUPPORT;
-    /** Address family not supported by protocol family */
-    public static final int EAFNOSUPPORT;
-    /** Address already in use */
-    public static final int EADDRINUSE;
-    /** Can't assign requested address */
-    public static final int EADDRNOTAVAIL;
-    /** Network is down */
-    public static final int ENETDOWN;
-    /** Network is unreachable */
-    public static final int ENETUNREACH;
-    /** Network dropped connection on reset */
-    public static final int ENETRESET;
-    /** Software caused connection abort */
-    public static final int ECONNABORTED;
-    /** Connection reset by peer */
-    public static final int ECONNRESET;
-    /** No buffer space available */
-    public static final int ENOBUFS;
-    /** Socket is already connected */
-    public static final int EISCONN;
-    /** Socket is not connected */
-    public static final int ENOTCONN;
-    /** Can't send after socket shutdown */
-    public static final int ESHUTDOWN;
-    /** Too many references: can't splice */
-    public static final int ETOOMANYREFS;
-    /** Operation timed out */
-    public static final int ETIMEDOUT;
-    /** Connection refused */
-    public static final int ECONNREFUSED;
-    /** Too many levels of symbolic links */
-    public static final int ELOOP;
-    /** File name too long */
-    public static final int ENAMETOOLONG;
-    /** Host is down */
-    public static final int EHOSTDOWN;
-    /** No route to host */
-    public static final int EHOSTUNREACH;
-    /** Directory not empty */
-    public static final int ENOTEMPTY;
-    /** Too many processes */
-    public static final int EPROCLIM;
-    /** Too many users */
-    public static final int EUSERS;
-    /** Disk quota exceeded */
-    public static final int EDQUOT;
-    /** Stale NFS file handle */
-    public static final int ESTALE;
-    /** Too many levels of remote in path */
-    public static final int EREMOTE;
-    /** RPC struct is bad */
-    public static final int EBADRPC;
-    /** RPC version wrong */
-    public static final int ERPCMISMATCH;
-    /** RPC prog. not avail */
-    public static final int EPROGUNAVAIL;
-    /** Program version wrong */
-    public static final int EPROGMISMATCH;
-    /** Bad procedure for program */
-    public static final int EPROCUNAVAIL;
-    /** No locks available */
-    public static final int ENOLCK;
-    /** Function not implemented */
-    public static final int ENOSYS;
-    /** Inappropriate file type or format */
-    public static final int EFTYPE;
-    /** Authentication error */
-    public static final int EAUTH;
-    /** Need authenticator */
-    public static final int ENEEDAUTH;
-    /** IPsec processing failure */
-    public static final int EIPSEC;
-    /** Attribute not found */
-    public static final int ENOATTR;
-    /** Illegal byte sequence */
-    public static final int EILSEQ;
-    /** No medium found */
-    public static final int ENOMEDIUM;
-    /** Wrong Medium Type */
-    public static final int EMEDIUMTYPE;
-    /** Conversion overflow */
-    public static final int EOVERFLOW;
-    /** Operation canceled */
-    public static final int ECANCELED;
-    /** Identifier removed */
-    public static final int EIDRM;
-    /** No message of desired type */
-    public static final int ENOMSG;
+    private static native int init0();
 
     /* Hard coded definitions for acr/error.h
      */
@@ -326,7 +41,7 @@ public class Status
      *     on systems which don't have the corresponding errno.
      */
     private static final int OS_START_CANONERR      = 500000;
-    private static final int OS_LAST_CANONERR;
+    private static final int OS_LAST_CANONERR       = init0();
     /**
      * ACR_OS_ERRSPACE_SIZE is the maximum number of errors you can fit
      *    into one of the error/status ranges below -- except for

Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Security.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Security.java?rev=1094914&r1=1094913&r2=1094914&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Security.java
(original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/Security.java
Tue Apr 19 07:47:00 2011
@@ -16,6 +16,7 @@
 
 package org.apache.commons.runtime.platform.windows;
 
+import org.apache.commons.runtime.Errno;
 import org.apache.commons.runtime.Status;
 import org.apache.commons.runtime.AlreadyExistsException;
 import org.apache.commons.runtime.NoSuchObjectException;
@@ -90,7 +91,7 @@ final class Security
         long nd = ConvertStringSecurityDescriptorToSecurityDescriptor(sdd.toString(), SDDL_REVISION_1);
         if (nd == 0L) {
             // Throw SystemException
-            throw new SystemException(Status.msg());
+            throw new SystemException(Errno.msg());
         }
         sd = sdcache.put(key.toString(), new Long(nd));
         if (sd != null) {

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=1094914&r1=1094913&r2=1094914&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/error.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/error.c Tue Apr 19 07:47:00 2011
@@ -768,7 +768,12 @@ AcrThrowByStatus(JNI_STDENV, int err, co
     AcrThrow(env, cls, msg);
 }
 
-ACR_JNI_EXPORT(void, Status, init0)(JNI_STDARGS, jintArray ra)
+ACR_JNI_EXPORT(jint, Status, init0)(JNI_STDARGS)
+{
+    return ACR_OS_LAST_CANONERR - ACR_OS_START_CANONERR;
+}
+
+ACR_JNI_EXPORT(void, Errno, init0)(JNI_STDARGS, jintArray ra)
 {
     jint i[92];
 
@@ -918,12 +923,12 @@ ACR_JNI_EXPORT(jboolean, Status, is0)(JN
     return rv;
 }
 
-ACR_JNI_EXPORT(jint, Status, errno)(JNI_STDARGS)
+ACR_JNI_EXPORT(jint, Errno, get)(JNI_STDARGS)
 {
     return AcrGetThreadError();
 }
 
-ACR_JNI_EXPORT(jstring, Status, err)(JNI_STDARGS)
+ACR_JNI_EXPORT(jstring, Errno, msg)(JNI_STDARGS)
 {
     char buf[ACR_MBUFF_SIZ] = "";
 



Mime
View raw message