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

[ronald at mulgara.org]

Author: ronald
Date: 2009-04-03 14:19:48 -0700 (Fri, 03 Apr 2009)
New Revision: 1648

Modified:
   trunk/src/jar/query/java/org/mulgara/query/Query.java
Log:
Backing out r1589 (protecting answer.close with a null check) because r1592
obviated it.

Modified: trunk/src/jar/query/java/org/mulgara/query/Query.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/Query.java	2009-03-26 20:31:07 UTC (rev 1647)
+++ trunk/src/jar/query/java/org/mulgara/query/Query.java	2009-04-03 21:19:48 UTC (rev 1648)
@@ -405,10 +405,8 @@
    * Close this {@link Query}, and the underlying {@link Answer} objects.
    */
   public void close() throws TuplesException {
-    if (answer != null) {
-      answer.close();
-      answer = null;
-    }
+    answer.close();
+    answer = null;
 
     if (mutableVariableList != null) {
       for (SelectElement v: mutableVariableList) {