DRILL-4358: Fix NPE in UserServer.close()

- Also remove untested CustomSerDe's from CustomTunnel.
- Fix GuavaPatcher copy-paste comment mistake.

closes #362

1 files changed, 1 insertions, 7 deletions

diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/GuavaPatcher.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/GuavaPatcher.java
index 3e0cdeeb1..8f24da802 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/GuavaPatcher.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/GuavaPatcher.java
@@ -74,14 +74,8 @@ public class GuavaPatcher {
     ClassPool cp = ClassPool.getDefault();
     CtClass cc = cp.get("com.google.common.io.Closeables");
 
-    // Expose the constructor for Stopwatch for old libraries who use the pattern new Stopwatch().start().
-    for (CtConstructor c : cc.getConstructors()) {
-      if (!Modifier.isStatic(c.getModifiers())) {
-        c.setModifiers(Modifier.PUBLIC);
-      }
-    }
 
-    // Add back the Stopwatch.elapsedMillis() method for old consumers.
+    // Add back the Closeables.closeQuietly() method for old consumers.
     CtMethod newmethod = CtNewMethod.make(
         "public static void closeQuietly(java.io.Closeable closeable) { try{closeable.close();}catch(Exception e){} }",
         cc);