Changeset 5769

Timestamp:

Sep 29, 2011, 10:44:38 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1632: NullPointerException? when using JEP mapping for column with string values

The reason for the NullPointerException? was that we tried to convert the string to a double. This is now fixed and I have also changed JEP to pass on exceptions instead of swallowing them. I hope that doesn't cause problems elsewhere.

Location:

trunk/src/core/net/sf/basedb/util

Files:

• jep/FunctionSafeJep.java (modified) (2 diffs)
• parser/ColFunction.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/jep/FunctionSafeJep.java

@@ -31 +31 @@
 import org.nfunk.jep.FunctionTable;
 import org.nfunk.jep.JEP;
+import org.nfunk.jep.Node;
 import org.nfunk.jep.ParseException;
 import org.nfunk.jep.Token;
@@ -77 +78 @@
     this.errorList.add(error);
   }
-  
+
+  /**
+    Override the superclass method so that exceptions are passed on
+    instead of swallowed.
+    @since 3.0
+  */
+  @Override
+  public Object getValueAsObject() 
+  {
+    Node topNode = getTopNode();
+    if (topNode == null || hasError()) return null;
+    try
+    {
+      return this.ev.getValue(topNode, this.symTab);
+    }
+    catch (ParseException ex)
+    {
+      throw new RuntimeException(ex);
+    }
+  }
+
   /**
     Function table implementation that pretends that all possible functions

trunk/src/core/net/sf/basedb/util/parser/ColFunction.java

@@ -170 +170 @@
       {
         pos.setIndex(0);
-        d = numberFormat.parse(value, pos).doubleValue();
-        if (pos.getIndex() < value.length())
+        Number n = numberFormat.parse(value, pos);
+        if (n == null || pos.getIndex() < value.length())
         {
           stack.push(value);
           return;
         }
+        d = n.doubleValue();
       }
     }