You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/12/30 22:24:44 UTC

[1/3] git commit: ACCUMULO-2105 cannot close instance

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 5e247981d -> 379881e69
  refs/heads/master 0f5f65a27 -> bdc6c041a


ACCUMULO-2105 cannot close instance


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/379881e6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/379881e6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/379881e6

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 379881e69bd7e93f11cfa13b415afe14be8634f6
Parents: 5e24798
Author: Eric Newton <er...@gmail.com>
Authored: Mon Dec 30 16:24:43 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Mon Dec 30 16:24:43 2013 -0500

----------------------------------------------------------------------
 .../core/client/mapreduce/lib/util/InputConfigurator.java      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/379881e6/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
index 7419d9b..9454d59 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
@@ -601,11 +601,7 @@ public class InputConfigurator extends ConfiguratorBase {
     if ("MockInstance".equals(instanceType))
       return new MockTabletLocator();
     Instance instance = getInstance(implementingClass, conf);
-    try {
-      return TabletLocator.getLocator(instance, new Text(tableId));
-    } finally {
-      instance.close();
-    }
+    return TabletLocator.getLocator(instance, new Text(tableId));
   }
 
   // InputFormat doesn't have the equivalent of OutputFormat's checkOutputSpecs(JobContext job)


[2/3] git commit: ACCUMULO-2105 cannot close instance

Posted by ec...@apache.org.
ACCUMULO-2105 cannot close instance


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/379881e6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/379881e6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/379881e6

Branch: refs/heads/master
Commit: 379881e69bd7e93f11cfa13b415afe14be8634f6
Parents: 5e24798
Author: Eric Newton <er...@gmail.com>
Authored: Mon Dec 30 16:24:43 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Mon Dec 30 16:24:43 2013 -0500

----------------------------------------------------------------------
 .../core/client/mapreduce/lib/util/InputConfigurator.java      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/379881e6/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
index 7419d9b..9454d59 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
@@ -601,11 +601,7 @@ public class InputConfigurator extends ConfiguratorBase {
     if ("MockInstance".equals(instanceType))
       return new MockTabletLocator();
     Instance instance = getInstance(implementingClass, conf);
-    try {
-      return TabletLocator.getLocator(instance, new Text(tableId));
-    } finally {
-      instance.close();
-    }
+    return TabletLocator.getLocator(instance, new Text(tableId));
   }
 
   // InputFormat doesn't have the equivalent of OutputFormat's checkOutputSpecs(JobContext job)


[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bdc6c041
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdc6c041
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdc6c041

Branch: refs/heads/master
Commit: bdc6c041a745b8ff1e6c78dd84129ba485e28c4c
Parents: 0f5f65a 379881e
Author: Eric Newton <er...@gmail.com>
Authored: Mon Dec 30 16:25:01 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Mon Dec 30 16:25:01 2013 -0500

----------------------------------------------------------------------
 .../core/client/mapreduce/lib/util/InputConfigurator.java      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------