sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject sqoop git commit: SQOOP-2606. Sqoop2: Do not reconfigure log4j if there are no log4j properties inside sqoop.properties file
Date Fri, 09 Oct 2015 18:51:58 GMT
Repository: sqoop
Updated Branches:
  refs/heads/sqoop2 0ea90d024 -> 38de9dde8


SQOOP-2606. Sqoop2: Do not reconfigure log4j if there are no log4j properties inside sqoop.properties
file

(Jarcec via Hari)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/38de9dde
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/38de9dde
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/38de9dde

Branch: refs/heads/sqoop2
Commit: 38de9dde8ddd5cab1fa94d06bf3cac5e55ff457c
Parents: 0ea90d0
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Fri Oct 9 11:51:02 2015 -0700
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Fri Oct 9 11:51:52 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/sqoop/core/SqoopConfiguration.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/38de9dde/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java b/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
index ab5b2ee..3c2f67e 100644
--- a/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
+++ b/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
@@ -290,6 +290,11 @@ public class SqoopConfiguration implements Reconfigurable {
       }
     }
 
+    if (props.isEmpty()) {
+      LOG.info("Skipping log4j configuration as it's not configured in sqoop.properties file.");
+      return;
+    }
+
     PropertyConfigurator.configure(props);
   }
 


Mime
View raw message