netcdftools-commit

[Netcdftools-commit] SF.net SVN: netcdftools:[82] trunk/src/main/java/au/csiro/netcdf/ NcWriteVariable.java

[<rob...@us...>]

Revision: 82
          http://netcdftools.svn.sourceforge.net/netcdftools/?rev=82&view=rev
Author:   robertbridle
Date:     2010-08-18 05:07:38 +0000 (Wed, 18 Aug 2010)

Log Message:
-----------
ANDSWRON-290 - Caught NullPointerException when an invalid variable is specified on the command line. We now throw an InvalidArgumentException instead.

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java

Modified: trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java
===================================================================
--- trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java	2010-08-16 07:40:34 UTC (rev 81)
+++ trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java	2010-08-18 05:07:38 UTC (rev 82)
@@ -172,6 +172,14 @@
         try
         {
             Variable variable = ncfile.findVariable(NetcdfFile.escapeName(variableName));
+            
+            // Check the variable exists
+            if (variable == null)
+            {
+                throw new IllegalArgumentException("The variable: " + variableName + " does not exist in the file: "
+                        + ncfile.getLocation());
+            }
+            
             List<Range> ranges = variable.getRanges();
             
             // Check the ranges match
@@ -224,7 +232,6 @@
         {
             ncfile.close();
         }
-        
     }
 
     /* (non-Javadoc)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Netcdftools-commit] SF.net SVN: netcdftools:[86] trunk/src/main/java/au/csiro/netcdf/ NcWriteVariable.java

[<rit...@us...>]

Revision: 86
          http://netcdftools.svn.sourceforge.net/netcdftools/?rev=86&view=rev
Author:   ritacsiro
Date:     2010-08-30 07:31:03 +0000 (Mon, 30 Aug 2010)

Log Message:
-----------
ANDSWRON-462:ANDSWRDM - Conversion Tools - Error handling when fillrange exceeds actual range of values in binary file

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java

Modified: trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java
===================================================================
--- trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java	2010-08-30 06:10:19 UTC (rev 85)
+++ trunk/src/main/java/au/csiro/netcdf/NcWriteVariable.java	2010-08-30 07:31:03 UTC (rev 86)
@@ -601,8 +601,9 @@
             String line = dataIn.readLine();
             if (line == null)
             {
-                System.err.println("Expected block of " + buffer.getSize() + " values but ran out after " + i + ".");
-                break;
+                String error = "Expected block of " + buffer.getSize() + " values but ran out after " + i + ".";
+                System.err.println(error);
+                throw new IllegalArgumentException(error);
             }
             if (isFloat)
             {
@@ -702,7 +703,7 @@
             {
                 String error = "Expected block of " + buffer.getSize() + " values but ran out after " + i + ".";
                 System.err.println(error);
-                throw new EOFException(error);
+                throw new IllegalArgumentException(error);
             }
             i++;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.