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

[ronald at mulgara.org]

Author: ronald
Date: 2009-03-04 06:07:56 -0800 (Wed, 04 Mar 2009)
New Revision: 1589

Modified:
   trunk/src/jar/query/java/org/mulgara/query/Query.java
Log:
Fix NPE on close() for subquery answers.

Modified: trunk/src/jar/query/java/org/mulgara/query/Query.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/Query.java	2009-03-04 14:07:52 UTC (rev 1588)
+++ trunk/src/jar/query/java/org/mulgara/query/Query.java	2009-03-04 14:07:56 UTC (rev 1589)
@@ -407,8 +407,10 @@
    * Close this {@link Query}, and the underlying {@link Answer} objects.
    */
   public void close() throws TuplesException {
-    answer.close();
-    answer = null;
+    if (answer != null) {
+      answer.close();
+      answer = null;
+    }
 
     if (mutableVariableList != null) {
       for (SelectElement v: mutableVariableList) {