[Mulgara-svn] r1473 - in trunk/src/jar: query/java/org/mulgara/query/filter querylang/java/org/mulgara/sparql querylang/java/org/mulgara/sparql/parser/cst

[pag at mulgara.org]

Author: pag
Date: 2009-02-02 21:37:24 -0800 (Mon, 02 Feb 2009)
New Revision: 1473

Modified:
   trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java
   trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java
   trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicRegEx.java
Log:
Fixed NPE error caused by the third parameter of RegEx was left as null

Modified: trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java	2009-02-03 04:59:27 UTC (rev 1472)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/RegexFn.java	2009-02-03 05:37:24 UTC (rev 1473)
@@ -62,7 +62,7 @@
   public RegexFn(ValueLiteral str, ValueLiteral patternStr, ValueLiteral flagExpression) {
     super(str, patternStr);
     this.flagExpression = flagExpression;
-    flagExpression.setContextOwner(this);
+    if (flagExpression != null) flagExpression.setContextOwner(this);
   }
 
   /** @see org.mulgara.query.filter.BinaryTestFilter#testCmp() */

Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java	2009-02-03 04:59:27 UTC (rev 1472)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java	2009-02-03 05:37:24 UTC (rev 1473)
@@ -186,6 +186,7 @@
    * @throws MulgaraParserException If the value was not mapped to an AST ValueLiteral.
    */
   static private ValueLiteral mapValue(Expression operand) throws MulgaraParserException {
+    if (operand == null) return null;
     RDFTerm op = mapExpression(operand);
     try {
       if (!op.isLiteral()) throw new MulgaraParserException("Non-literal resolution when a value is required from: " + op.getClass().getSimpleName());

Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicRegEx.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicRegEx.java	2009-02-03 04:59:27 UTC (rev 1472)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/parser/cst/BicRegEx.java	2009-02-03 05:37:24 UTC (rev 1473)
@@ -75,8 +75,9 @@
   public String getImage() {
     StringBuffer result = new StringBuffer("REGEX(");
     result.append(expr.getImage()).append(COMMA);
-    result.append(pattern.getImage()).append(COMMA);
-    result.append(flags.getImage()).append(")");
+    result.append(pattern.getImage());
+    if (flags != null) result.append(COMMA).append(flags.getImage());
+    result.append(")");
     return result.toString();
   }