filter: minor cleanup

Signed-off-by: Alexander Bezzubov <[email protected]>

Author: bzz

src/main/native/org_bblfsh_client_v2_libuast_Libuast.cc

@@ -645,13 +645,10 @@ Java_org_bblfsh_client_v2_libuast_Libuast_00024UastIter_nativeInit(
 JNIEXPORT void JNICALL
 Java_org_bblfsh_client_v2_libuast_Libuast_00024UastIter_nativeDispose(
     JNIEnv *env, jobject self) {
-  // FIXME:
-  //  either delete iff .nativeInit() was called
-  //  or never delete it, so client should do that instead
-  // this.ctx - delete the Context as iterator owns it
+  // this.ctx - delete as iterator owns it for both .iterate()/.filter() cases
   auto ctx = getHandle<Context>(env, self, "ctx");
-  setHandle<Context>(env, self, 0, "ctx");
   delete (ctx);
+  setHandle<Context>(env, self, 0, "ctx");
 
   // this.iter
   auto iter = getHandle<uast::Iterator<Node *>>(env, self, "iter");

src/test/scala/org/bblfsh/client/v2/BblfshClientUastApiTest.scala

@@ -78,7 +78,7 @@ class BblfshClientUastApiTest extends BblfshClientBaseTest {
   }
 
   "XPath query" should "filter native UAST" in {
-    val uast = resp.uast.decode().root()
+    val uast: NodeExt = resp.uast.decode().root()
     val it = BblfshClient.filter(uast, "//uast:Position")
 
     it.hasNext should be(true)
@@ -90,7 +90,7 @@ class BblfshClientUastApiTest extends BblfshClientBaseTest {
 
   "XPath query" should "filter managed UAST" in {
     val ctx = resp.uast.decode()
-    val uast = ctx.root().load()
+    val uast: JNode = ctx.root().load()
     ctx.dispose()
 
     val it = BblfshClient.filter(uast, "//uast:Position")
@@ -101,9 +101,9 @@ class BblfshClientUastApiTest extends BblfshClientBaseTest {
     it.close()
     it.hasNext should be(false)
   }
-  
+
   "XPath query" should "work another thread" in {
-    val ctx = resp.uast.decode()
+    val ctx: ContextExt = resp.uast.decode()
     val root = ctx.root()
     val th = new Thread(new Runnable {
       def run() {