You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/01/23 21:20:31 UTC
[07/10] storm git commit: [STORM-630] Support for Clojure 1.6.0
[STORM-630] Support for Clojure 1.6.0
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dd92c0d8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dd92c0d8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dd92c0d8
Branch: refs/heads/master
Commit: dd92c0d87e589b345ae1167e7318e43ba44556bf
Parents: bc54e8e
Author: lewuathe <le...@me.com>
Authored: Wed Jan 21 22:04:14 2015 +0900
Committer: lewuathe <le...@me.com>
Committed: Wed Jan 21 22:04:14 2015 +0900
----------------------------------------------------------------------
pom.xml | 2 +-
storm-core/src/clj/backtype/storm/util.clj | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dd92c0d8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 05e2be3..f943771 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,7 @@
<test.extra.args>-Djava.net.preferIPv4Stack=true</test.extra.args>
<!-- dependency versions -->
- <clojure.version>1.5.1</clojure.version>
+ <clojure.version>1.6.0</clojure.version>
<compojure.version>1.1.3</compojure.version>
<hiccup.version>0.3.6</hiccup.version>
<commons-io.version>2.4</commons-io.version>
http://git-wip-us.apache.org/repos/asf/storm/blob/dd92c0d8/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj
index c2bec3e..95120c1 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -617,7 +617,7 @@
(while (not (apredicate))
(Time/sleep 100)))
-(defn some?
+(defn some-in-seq?
[pred aseq]
((complement nil?) (some pred aseq)))
@@ -854,7 +854,7 @@
(defn zip-contains-dir?
[zipfile target]
(let [entries (->> zipfile (ZipFile.) .entries enumeration-seq (map (memfn getName)))]
- (some? #(.startsWith % (str target "/")) entries)))
+ (some-in-seq? #(.startsWith % (str target "/")) entries)))
(defn url-encode
[s]