From 4a230abb44e99699f1c00225291d974669e634c4 Mon Sep 17 00:00:00 2001
From: Tom Morris <tfmorris@gmail.com>
Date: Fri, 7 Oct 2011 18:55:46 +0000
Subject: [PATCH] Narrow exception handling

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2294 7d457c2a-affb-35e4-300a-418c747d4874
---
 .../google/refine/importers/ImporterUtilities.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/src/com/google/refine/importers/ImporterUtilities.java b/main/src/com/google/refine/importers/ImporterUtilities.java
index 6b0725bf7..47f94756b 100644
--- a/main/src/com/google/refine/importers/ImporterUtilities.java
+++ b/main/src/com/google/refine/importers/ImporterUtilities.java
@@ -84,9 +84,11 @@ public class ImporterUtilities {
         int value = def;
         if (options.containsKey(name)) {
             String s = options.getProperty(name);
-            try {
-                value = Integer.parseInt(s);
-            } catch (Exception e) {
+            if (s != null) {
+                try {
+                    value = Integer.parseInt(s);
+                } catch (NumberFormatException e) {
+                }
             }
         }
         return value;
@@ -96,9 +98,8 @@ public class ImporterUtilities {
         boolean value = def;
         if (options.containsKey(name)) {
             String s = options.getProperty(name);
-            try {
-                value = s.equalsIgnoreCase("on") || s.equals("1") || Boolean.parseBoolean(s);
-            } catch (Exception e) {
+            if (s != null) {
+                value = "on".equalsIgnoreCase(s) || "1".equals(s) || Boolean.parseBoolean(s);
             }
         }
         return value;