Merge remote-tracking branch 'origin/develop' into monotonic_timer

1 files changed, 22 insertions, 6 deletions

diff --git a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
index 5ae977d..54acbdd 100644
--- a/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
+++ b/java/src/hdf/hdf5lib/exceptions/HDF5LibraryException.java
@@ -30,6 +30,9 @@ import hdf.hdf5lib.HDF5Constants;
 
 @SuppressWarnings("serial")
 public class HDF5LibraryException extends HDF5Exception {
+    private final long majorErrorNumber;
+    private final long minorErrorNumber;
+
     /**
      * Constructs an <code>HDF5LibraryException</code> with no specified detail
      * message.
@@ -44,9 +47,10 @@ public class HDF5LibraryException extends HDF5Exception {
         }
         catch (Exception e) {
         }
-        ;
 
-        detailMessage = getMinorError(getMinorErrorNumber());
+        this.majorErrorNumber = _getMajorErrorNumber();
+        this.minorErrorNumber = _getMinorErrorNumber();
+        detailMessage = getMinorError(minorErrorNumber);
     }
 
     /**
@@ -65,7 +69,8 @@ public class HDF5LibraryException extends HDF5Exception {
         }
         catch (Exception e) {
         }
-        ;
+        this.majorErrorNumber = _getMajorErrorNumber();
+        this.minorErrorNumber = _getMinorErrorNumber();
     }
 
     /**
@@ -74,7 +79,11 @@ public class HDF5LibraryException extends HDF5Exception {
      *
      * @return the major error number
      */
-    public native long getMajorErrorNumber();
+    public long getMajorErrorNumber()
+    {
+        return majorErrorNumber;
+    }
+    private native long _getMajorErrorNumber();
 
     /**
      * Get the minor error number of the first error on the HDF5 library error
@@ -82,7 +91,11 @@ public class HDF5LibraryException extends HDF5Exception {
      *
      * @return the minor error number
      */
-    public native long getMinorErrorNumber();
+    public long getMinorErrorNumber()
+    {
+        return minorErrorNumber;
+    }
+    private native long _getMinorErrorNumber();
 
     /**
      * Return a error message for the minor error number.
@@ -158,6 +171,9 @@ public class HDF5LibraryException extends HDF5Exception {
         else if (err_code == HDF5Constants.H5E_MOUNT) {
             return "file mount error";
         }
+        else if (err_code == HDF5Constants.H5E_CANTDELETEFILE) {
+            return "Unable to delete file";
+        }
         else if (err_code == HDF5Constants.H5E_SEEKERROR) {
             return "seek failed";
         }
@@ -249,7 +265,7 @@ public class HDF5LibraryException extends HDF5Exception {
             return "unrecognized message";
         }
         else if (err_code == HDF5Constants.H5E_CANTDELETE) {
-            return " Can't delete message";
+            return "Can't delete message";
         }
         else if (err_code == HDF5Constants.H5E_CANTOPENOBJ) {
             return "Can't open object";