From 83d40868c8166897e74f7704bbd2a5ac29bb885d Mon Sep 17 00:00:00 2001
From: Daniel Voros <dvoros@hortonworks.com>
Date: Tue, 2 Apr 2019 18:05:36 +0200
Subject: [PATCH] SQOOP-3134

Change-Id: Iddce5d0eae6fcbe81be62318774b6f493b0d89e5
---
 src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
index 05ac46c0..4df3ef82 100644
--- a/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
+++ b/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
@@ -104,7 +104,7 @@ public Schema generate(String schemaNameOverride) throws IOException {
     }
 
     TableClassName tableClassName = new TableClassName(options);
-    String shortClassName = tableName == null ? DEFAULT_SCHEMA_NAME : tableClassName.getShortClassForTable(tableName);
+    String shortClassName = (tableName == null && options.getClassName() == null) ? DEFAULT_SCHEMA_NAME : tableClassName.getShortClassForTable(tableName);
     String avroTableName = (tableName == null ? TableClassName.QUERY_RESULT : tableName);
     String avroName = schemaNameOverride != null ? schemaNameOverride :
         (shortClassName == null ? avroTableName : shortClassName);