fixed error with orc data source

Author: Joseph Batchik

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/ddl.scala

@@ -203,18 +203,18 @@ private[sql] object ResolvedDataSource extends Logging {
   private def tryLoad(provider: String): Option[Class[_]] = try {
     Some(loader.loadClass(provider))
   } catch {
-    case cnf: ClassNotFoundException => if (provider.startsWith("org.apache.spark.sql.hive.orc")) {
-      sys.error("The ORC data source must be used with Hive support enabled.")
-    } else {
-      None
-    }
+    case cnf: ClassNotFoundException => None
   }
 
   /** Given a provider name, look up the data source class definition. */
   def lookupDataSource(provider: String): Class[_] = {
     serviceLoader.iterator().filter(_.format() == provider).toList match {
-      case Nil => tryLoad(provider).orElse(tryLoad(s"$provider.DefaultSource"))
-        .getOrElse(sys.error(s"Failed to load class for data source: $provider"))
+      case Nil => tryLoad(provider).orElse(tryLoad(s"$provider.DefaultSource")).getOrElse(
+        if (provider.startsWith("org.apache.spark.sql.hive.orc")) {
+          sys.error("The ORC data source must be used with Hive support enabled.")
+        } else {
+          sys.error(s"Failed to load class for data source: $provider")
+        })
       case head :: Nil => head.getClass
       case sources => sys.error(s"Multiple sources found for $provider, " +
         s"(${sources.map(_.getClass.getName).mkString(", ")}), " +