You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/11 17:20:55 UTC
[1/3] git commit: clean up fd after reading config
Repository: incubator-storm
Updated Branches:
refs/heads/master 6c1af3e5b -> 1be3d0f65
clean up fd after reading config
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/9da324e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/9da324e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/9da324e1
Branch: refs/heads/master
Commit: 9da324e12ff12dec97490197063ff35f6935ca93
Parents: 2cd8f99
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Apr 10 21:38:45 2014 +0000
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Apr 10 21:38:45 2014 +0000
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/utils/Utils.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/9da324e1/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 0e04728..7979e4b 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -29,6 +29,7 @@ import com.netflix.curator.retry.ExponentialBackoffRetry;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -135,7 +136,13 @@ public class Utils {
}
URL resource = resources.iterator().next();
Yaml yaml = new Yaml();
- Map ret = (Map) yaml.load(new InputStreamReader(resource.openStream()));
+ Map ret = null;
+ InputStream input = resource.openStream();
+ try {
+ ret = (Map) yaml.load(new InputStreamReader(input));
+ } finally {
+ input.close();
+ }
if(ret==null) ret = new HashMap();
[3/3] git commit: STORM-281: update changelog
Posted by pt...@apache.org.
STORM-281: update changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/1be3d0f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/1be3d0f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/1be3d0f6
Branch: refs/heads/master
Commit: 1be3d0f65e4fcb604b14c11a3261aa0cf109ef71
Parents: 0138928
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 11 11:20:44 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 11 11:20:44 2014 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/1be3d0f6/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cccda61..764b9f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-281: fix and issue with config parsing that could lead to leaking file descriptors
* STORM-196: When JVM_OPTS are set, storm jar fails to detect storm.jar from environment
* STORM-260: Fix a potential race condition with simulated time in Storm's unit tests
* STORM-258: Update commons-io version to 2.4
[2/3] git commit: Merge branch 'fix-readconfig-fd-leak' of
github.com:d2r/incubator-storm
Posted by pt...@apache.org.
Merge branch 'fix-readconfig-fd-leak' of github.com:d2r/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/01389288
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/01389288
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/01389288
Branch: refs/heads/master
Commit: 01389288fecbe13b00cebbfb3e68093f19717766
Parents: 6c1af3e 9da324e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 11 11:19:03 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 11 11:19:03 2014 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/utils/Utils.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------