[Mulgara-svn] r193 - in trunk/src/jar: resolver/java/org/mulgara/resolver resolver-relational/java/org/mulgara/resolver/relational

[pag at mulgara.org]

Author: pag
Date: 2007-02-28 20:58:53 -0600 (Wed, 28 Feb 2007)
New Revision: 193

Modified:
   trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolution.java
   trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyModelOperation.java
Log:
Closing abandoned Answer/Tuples

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyModelOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyModelOperation.java	2007-02-25 14:46:42 UTC (rev 192)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/ModifyModelOperation.java	2007-03-01 02:58:53 UTC (rev 193)
@@ -195,20 +195,27 @@
       statements = new TripleSetWrapperStatements(
         tripleSet, systemResolver, TripleSetWrapperStatements.PERSIST
       );
-    }
-    else {
+    } else {
       assert query != null;
 
       Answer answer = operationContext.doQuery(query);
-      Variable[] vars = answer.getVariables();
-      assert vars.length == 3;
-      statements = new TuplesWrapperStatements(
-          new LocalizedTuples(systemResolver, answer),
-          vars[0], vars[1], vars[2]);
+      try {
+        Variable[] vars = answer.getVariables();
+        assert vars.length == 3;
+        statements = new TuplesWrapperStatements(
+            new LocalizedTuples(systemResolver, answer),
+            vars[0], vars[1], vars[2]);
+      } finally {
+        answer.close();
+      }
     }
     assert statements != null;
 
-    doModify(operationContext, systemResolver, modelURI, statements, insert);
+    try {
+      doModify(operationContext, systemResolver, modelURI, statements, insert);
+    } finally {
+      statements.close();
+    }
   }
 
 

Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolution.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolution.java	2007-02-25 14:46:42 UTC (rev 192)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolution.java	2007-03-01 02:58:53 UTC (rev 193)
@@ -425,15 +425,26 @@
     Answer answer;
     answer = new RelationalAnswer(query, conn);
 
-    Tuples lt;
-    lt = new LocalizedTuples(resolverSession, answer, false);
-    Tuples st = TuplesOperations.sort(lt);
-    // lt.close() !!!! remember this.
+    Tuples lt, st;
+    try {
+      lt = new LocalizedTuples(resolverSession, answer, false);
+    } finally {
+      answer.close();
+    }
+    try {
+      st = TuplesOperations.sort(lt);
+    } finally {
+      lt.close();
+    }
     
     // Combine result with additional properties via join.
     additionalProperties.add(st);
-    Tuples jt = TuplesOperations.join(additionalProperties);
-    st.close();
+    Tuples jt;
+    try {
+      jt = TuplesOperations.join(additionalProperties);
+    } finally {
+      st.close();
+    }
 
     return jt;
   }