Return-Path: 
 <commits-return-17774-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A944519A3E
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Thu, 31 Mar 2016 18:56:17 +0000 (UTC)
Received: (qmail 88351 invoked by uid 500); 31 Mar 2016 18:56:17 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 88312 invoked by uid 500); 31 Mar 2016 18:56:17 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 88303 invoked by uid 99); 31 Mar 2016 18:56:17 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Mar 2016 18:56:17 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 61DA1E00B4; Thu, 31 Mar 2016 18:56:17 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dlmarion@apache.org
To: commits@accumulo.apache.org
Date: Thu, 31 Mar 2016 18:56:18 -0000
Message-Id: <2ac6b12959ba4fb1a162ada85f7c9093@git.apache.org>
In-Reply-To: <745b813b4dd546709c3b1a4e30dccb78@git.apache.org>
References: <745b813b4dd546709c3b1a4e30dccb78@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: cd5eb1f124ecc58021f33c73e963160974bd01c2
Parents: 7d06316 f6bfe90
Author: Dave Marion <dlmarion@apache.org>
Authored: Thu Mar 31 14:32:46 2016 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Thu Mar 31 14:32:46 2016 -0400

----------------------------------------------------------------------
 assemble/conf/templates/accumulo-env.sh         |  2 +-
 .../apache/accumulo/tserver/TabletServer.java   | 25 ++++----------------
 .../start/classloader/vfs/ContextManager.java   |  7 ++++--
 3 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5eb1f1/assemble/conf/templates/accumulo-env.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5eb1f1/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 71ad6bc,ac8f2ec..eabf51d
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2782,31 -3588,16 +2782,16 @@@ public class TabletServer extends Accum
      Runnable contextCleaner = new Runnable() {
        @Override
        public void run() {
-         ArrayList<KeyExtent> extents;
- 
-         synchronized (onlineTablets) {
-           extents = new ArrayList<KeyExtent>(onlineTablets.keySet());
-         }
- 
-         Set<Text> tables = new HashSet<Text>();
- 
-         for (KeyExtent keyExtent : extents) {
-           tables.add(keyExtent.getTableId());
-         }
- 
-         HashSet<String> contexts = new HashSet<String>();
- 
-         for (Text tableid : tables) {
-           String context = getTableConfiguration(new KeyExtent(tableid, null, null)).get(Property.TABLE_CLASSPATH);
-           if (!context.equals("")) {
-             contexts.add(context);
-           }
 -        Set<String> contextProperties = getSystemConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet();
++        Set<String> contextProperties = getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet();
+         Set<String> configuredContexts = new HashSet<String>();
+         for (String prop : contextProperties) {
+           configuredContexts.add(prop.substring(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.name().length()));
          }
  
          try {
-           AccumuloVFSClassLoader.getContextManager().removeUnusedContexts(contexts);
+           AccumuloVFSClassLoader.getContextManager().removeUnusedContexts(configuredContexts);
          } catch (IOException e) {
 -          log.warn(e.getMessage(), e);
 +          log.warn("{}", e.getMessage(), e);
          }
        }
      };

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd5eb1f1/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
----------------------------------------------------------------------