You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2016/09/08 15:28:51 UTC
[29/50] [abbrv] flink git commit: [FLINK-4403] [rpc] Use relative
classloader for proxies, rather than system class loader.
[FLINK-4403] [rpc] Use relative classloader for proxies, rather than system class loader.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a7e3579b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a7e3579b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a7e3579b
Branch: refs/heads/flip-6
Commit: a7e3579b2f1a88db3cde13e324e11ee0dbc0a9e4
Parents: f94ae53
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Aug 16 21:11:01 2016 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Thu Sep 8 17:26:58 2016 +0200
----------------------------------------------------------------------
.../org/apache/flink/runtime/rpc/akka/AkkaRpcService.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/a7e3579b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java
index b647bbd..d987c2f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java
@@ -104,9 +104,14 @@ public class AkkaRpcService implements RpcService {
InvocationHandler akkaInvocationHandler = new AkkaInvocationHandler(actorRef, timeout, maximumFramesize);
+ // Rather than using the System ClassLoader directly, we derive the ClassLoader
+ // from this class . That works better in cases where Flink runs embedded and all Flink
+ // code is loaded dynamically (for example from an OSGI bundle) through a custom ClassLoader
+ ClassLoader classLoader = AkkaRpcService.this.getClass().getClassLoader();
+
@SuppressWarnings("unchecked")
C proxy = (C) Proxy.newProxyInstance(
- ClassLoader.getSystemClassLoader(),
+ classLoader,
new Class<?>[] {clazz},
akkaInvocationHandler);