code cleanup

Author: hmottestad

core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/DefaultEvaluationStrategy.java

@@ -716,9 +716,18 @@ protected QueryEvaluationStep prepare(DescribeOperator node, QueryEvaluationCont
 
 			@Override
 			public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(BindingSet bs) {
-				return new DescribeIteration(child.evaluate(bs), DefaultEvaluationStrategy.this,
-						node.getBindingNames(),
-						bs);
+				CloseableIteration<BindingSet, QueryEvaluationException> evaluate = null;
+
+				try {
+					evaluate = child.evaluate(bs);
+					return new DescribeIteration(evaluate, DefaultEvaluationStrategy.this, node.getBindingNames(), bs);
+				} catch (Throwable t) {
+					if (evaluate != null) {
+						evaluate.close();
+					}
+					throw t;
+				}
+
 			}
 		};
 	}

core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/iterator/DescribeIteration.java

@@ -230,11 +230,11 @@ protected void handleClose() throws QueryEvaluationException {
 				if (currentDescribeExprIter != null)
 					currentDescribeExprIter.close();
 			} finally {
-
-			}
-			if (sourceIter instanceof CloseableIteration) {
-				((CloseableIteration<?, QueryEvaluationException>) sourceIter).close();
+				if (sourceIter instanceof CloseableIteration) {
+					((CloseableIteration<?, QueryEvaluationException>) sourceIter).close();
+				}
 			}
+
 		}
 	}
 }