DRILL-1409: DbVisualizer fails to connect to Drill using embedded jdbc driver

1 files changed, 11 insertions, 8 deletions

diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
index f31822728..4c54780f3 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
@@ -48,7 +48,6 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
   public final DrillStatementRegistry registry = new DrillStatementRegistry();
   final DrillConnectionConfig config;
 
-
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillConnection.class);
 
   private final DrillClient client;
@@ -56,14 +55,18 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
   private Drillbit bit;
   private RemoteServiceSet serviceSet;
 
-  protected DrillConnectionImpl(Driver driver, AvaticaFactory factory, String url, Properties info)  throws SQLException{
+  protected DrillConnectionImpl(Driver driver, AvaticaFactory factory, String url, Properties info) throws SQLException {
     super(driver, factory, url, info);
     this.config = new DrillConnectionConfig(info);
 
-
-
-    try{
+    try {
       if (config.isLocal()) {
+        try {
+          Class.forName("org.eclipse.jetty.server.Handler");
+        } catch (ClassNotFoundException e1) {
+          throw new SQLException("Running Drill in embedded mode using the JDBC jar alone is not supported.");
+        }
+
         DrillConfig dConfig = DrillConfig.create();
         this.allocator = new TopLevelAllocator(dConfig);
         RemoteServiceSet set = GlobalServiceSetReference.SETS.get();
@@ -72,8 +75,8 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
           serviceSet = RemoteServiceSet.getLocalServiceSet();
           set = serviceSet;
           try {
-          bit = new Drillbit(dConfig, serviceSet);
-          bit.run();
+            bit = new Drillbit(dConfig, serviceSet);
+            bit.run();
           } catch (Exception e) {
             throw new SQLException("Failure while attempting to start Drillbit in embedded mode.", e);
           }
@@ -94,7 +97,6 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
     }
   }
 
-
   @Override
   public DrillConnectionConfig config() {
     return config;
@@ -171,4 +173,5 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
       }
     }
   }
+
 }