timb: maybe-parse-int... don't die if already int

1 files changed, 8 insertions, 4 deletions

diff --git a/src/utils.clj b/src/utils.clj
index 4c6905c..9460bbc 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -301,11 +301,15 @@
 
 ;; Parsing
 
+(= (type 0) java.lang.Integer)
+
 (defn maybe-parse-int 
-  ([s] (Integer/parseInt s))
+  ([s] (maybe-parse-int s 0))
   ([s default]
-     (try (Integer/parseInt s)
-          (catch NumberFormatException _ default))))
+     (if (= (type s) java.lang.Integer)
+         s
+         (try (Integer/parseInt s)
+           (catch NumberFormatException _ default)))))
 
 (defn maybe-parse-long [s f]
   (if s (Long/parseLong s) f))
@@ -416,4 +420,4 @@
         (let [result (apply function arguments)]
           (swap! cached-results assoc arguments
             { :result result :time (System/currentTimeMillis)})
-          result)))))
\ No newline at end of file
+          result)))))