[Mulgara-svn] r1833 - trunk/src/jar/query/java/org/mulgara/query

[alexhall at mulgara.org]

Author: alexhall
Date: 2009-11-07 00:03:09 -0800 (Sat, 07 Nov 2009)
New Revision: 1833

Modified:
   trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java
Log:
Include the graph expression when getting the variable set.

Modified: trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java	2009-10-28 07:57:39 UTC (rev 1832)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstraintIn.java	2009-11-07 08:03:09 UTC (rev 1833)
@@ -43,6 +43,8 @@
 
   /** The IN element to set subconstraints to. */
   private ConstraintElement graph;
+  
+  private Set<Variable> variables;
 
   /**
    * Construct a filtered constraint.
@@ -83,7 +85,16 @@
 
   /** {@inheritDoc} */
   public Set<Variable> getVariables() {
-    return constraint.getVariables();
+    if (variables == null) {
+      if (graph instanceof Variable) {
+        Set<Variable> vars = new HashSet<Variable>(constraint.getVariables());
+        vars.add((Variable)graph);
+        variables = Collections.unmodifiableSet(vars);
+      } else {
+        variables = constraint.getVariables();
+      }
+    }
+    return variables;
   }