You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/06/01 07:02:45 UTC
[1/3] storm git commit: STORM-1853: Replace
ClassLoaderObjectInputStream with ObjectInputStream
Repository: storm
Updated Branches:
refs/heads/master 671e21ea2 -> d053fa7ca
STORM-1853: Replace ClassLoaderObjectInputStream with ObjectInputStream
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fafbaeb9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fafbaeb9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fafbaeb9
Branch: refs/heads/master
Commit: fafbaeb93aaa3c2e290efdcc3bb2953283e151d5
Parents: 7981ef2
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Sat May 21 00:44:14 2016 +0530
Committer: Abhishek Agarwal <ab...@inmobi.com>
Committed: Sat May 21 00:44:14 2016 +0530
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/utils/Utils.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fafbaeb9/storm-core/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/Utils.java b/storm-core/src/jvm/org/apache/storm/utils/Utils.java
index 6715407..b1fc51f 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/Utils.java
@@ -161,7 +161,7 @@ public class Utils {
private static ThreadLocal<TDeserializer> threadDes = new ThreadLocal<TDeserializer>();
private static SerializationDelegate serializationDelegate;
- private static ClassLoader cl = ClassLoader.getSystemClassLoader();
+ private static ClassLoader cl = null;
public static final boolean IS_ON_WINDOWS = "Windows_NT".equals(System.getenv("OS"));
public static final String FILE_PATH_SEPARATOR = System.getProperty("file.separator");
@@ -238,7 +238,13 @@ public class Utils {
public static <T> T javaDeserialize(byte[] serialized, Class<T> clazz) {
try {
ByteArrayInputStream bis = new ByteArrayInputStream(serialized);
- ObjectInputStream ois = new ClassLoaderObjectInputStream(cl, bis);
+ ObjectInputStream ois = null;
+ if (null == cl) {
+ ois = new ObjectInputStream(bis);
+ } else {
+ // Use custom class loader set in testing environment
+ ois = new ClassLoaderObjectInputStream(cl, bis);
+ }
Object ret = ois.readObject();
ois.close();
return (T)ret;
[3/3] storm git commit: add STORM-1853 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1853 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d053fa7c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d053fa7c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d053fa7c
Branch: refs/heads/master
Commit: d053fa7ca319f84131a078d2c5c784481610fe8c
Parents: cc723f5
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jun 1 15:55:01 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jun 1 15:55:01 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d053fa7c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c2f622..50a293a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@
* STORM-1868: Modify TridentKafkaWordCount to run in distributed mode
## 1.0.2
+ * STORM-1853: Replace ClassLoaderObjectInputStream with ObjectInputStream
* STORM-1730: LocalCluster#shutdown() does not terminate all storm threads/thread pools.
* STORM-1745: Add partition to log output in PartitionManager
* STORM-1735: Nimbus should log that replication succeeded when min replicas was reached exactly
[2/3] storm git commit: Merge branch 'STORM-1853' of
https://github.com/abhishekagarwal87/storm into STORM-1853
Posted by ka...@apache.org.
Merge branch 'STORM-1853' of https://github.com/abhishekagarwal87/storm into STORM-1853
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cc723f5c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cc723f5c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cc723f5c
Branch: refs/heads/master
Commit: cc723f5c3a824e2ecb952211119729d0592cd113
Parents: 671e21e fafbaeb
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jun 1 15:53:46 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jun 1 15:53:46 2016 +0900
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/utils/Utils.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------