[accumulo] branch main updated: Fixes #1976 table prop check in Shell (#1979)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 7de7928  Fixes #1976 table prop check in Shell (#1979)
7de7928 is described below

commit 7de7928274b2dca59095957e62d9356dc4b64034
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Mar 29 15:34:46 2021 -0400

    Fixes #1976 table prop check in Shell (#1979)
---
 shell/src/main/java/org/apache/accumulo/shell/Shell.java             | 2 +-
 .../org/apache/accumulo/start/classloader/vfs/ContextManager.java    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java 
b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 41d83bc..a3ecb76 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -484,7 +484,7 @@ public class Shell extends ShellOptions implements 
KeywordExecutable {
       // look for either the old property or the new one, but
       // if the new one is set, stop looking and let it take precedence
       if (entry.getKey().equals(Property.TABLE_CLASSLOADER_CONTEXT.getKey())
-          && entry.getValue() != null && !entry.getKey().isEmpty()) {
+          && entry.getValue() != null && !entry.getValue().isEmpty()) {
         return entry.getValue();
       }
       @SuppressWarnings("removal")
diff --git 
a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
 
b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
index 8c4db84..c53d815 100644
--- 
a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
+++ 
b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
@@ -189,13 +189,12 @@ class ContextManager {
     if (loader == null) {
       // oops, context was closed by another thread, try again
       ClassLoader loader2 = getClassLoader(contextName);
-      log.debug("Returning new classloader {} for context {}", 
loader2.getClass().getSimpleName(),
+      log.debug("Returning new classloader {} for context {}", 
loader2.getClass().getName(),
           contextName);
       return loader2;
     }
 
-    log.debug("Returning classloader {} for context {}", 
loader.getClass().getSimpleName(),
-        contextName);
+    log.debug("Returning classloader {} for context {}", 
loader.getClass().getName(), contextName);
     return loader;
 
   }