diff --git a/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java b/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java
index 7402c5a2..522ed083 100644
--- a/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java
+++ b/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java
@@ -71,12 +71,12 @@ public static List<URL> getConnectorConfigs() {
   }
 
   static boolean isConnectorJar(File file) {
-    try {
+    try (JarFile jarFile = new JarFile(file)) {
       @SuppressWarnings("resource")
-      JarEntry entry = new JarFile(file).getJarEntry(ConfigurationConstants.FILENAME_CONNECTOR_PROPERTIES);
+      JarEntry entry = jarFile.getJarEntry(ConfigurationConstants.FILENAME_CONNECTOR_PROPERTIES);
       return entry != null;
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }
-}
+}
\ No newline at end of file
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 49f139c3..8f9c445d 100644
--- a/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
+++ b/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
@@ -129,9 +129,7 @@ public synchronized void initialize() {
     }
 
     Properties bootstrapProperties = new Properties();
-    InputStream bootstrapPropStream = null;
-    try {
-      bootstrapPropStream = new FileInputStream(bootstrapConfig);
+    try (InputStream bootstrapPropStream = new FileInputStream(bootstrapConfig)) {
       bootstrapProperties.load(bootstrapPropStream);
     } catch (IOException ex) {
       throw new SqoopException(
@@ -267,11 +265,12 @@ private synchronized void configureClassLoader(String classpathProperty) {
 
   private synchronized void configureLogging() {
     Properties props = new Properties();
-    for (String key : config.keySet()) {
+    for (Map.Entry<String, String> entry : config.entrySet()) {
+      String key = entry.getKey();
       if (key.startsWith(ConfigurationConstants.PREFIX_LOG_CONFIG)) {
         String logConfigKey = key.substring(
             ConfigurationConstants.PREFIX_GLOBAL_CONFIG.length());
-        props.put(logConfigKey, config.get(key));
+        props.put(logConfigKey, entry.getValue());
       }
     }