You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by m4...@apache.org on 2017/04/13 13:21:31 UTC
[1/2] brooklyn-server git commit: Fix rebind of DSL instances
Repository: brooklyn-server
Updated Branches:
refs/heads/master 17728455c -> f2e86909c
Fix rebind of DSL instances
Previously xstream was injecting the wrong class loader, so we\u2019d
get errors like:
ClassNotFoundException:
org.apache.brooklyn.camp.brooklyn.spi.dsl.methods.DslComponent$DslConfigSupplier
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d350f705
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d350f705
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d350f705
Branch: refs/heads/master
Commit: d350f705a1da7adba87178802ed68aeb9262d910
Parents: 1772845
Author: Aled Sage <al...@gmail.com>
Authored: Thu Apr 13 12:54:58 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Apr 13 12:54:58 2017 +0100
----------------------------------------------------------------------
.../core/xstream/ObjectWithDefaultStringImplConverter.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d350f705/core/src/main/java/org/apache/brooklyn/util/core/xstream/ObjectWithDefaultStringImplConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ObjectWithDefaultStringImplConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ObjectWithDefaultStringImplConverter.java
index 116a309..62e3711 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ObjectWithDefaultStringImplConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ObjectWithDefaultStringImplConverter.java
@@ -25,6 +25,7 @@ import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.ConverterLookup;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.core.ClassLoaderReference;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
@@ -43,10 +44,10 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
*/
public class ObjectWithDefaultStringImplConverter implements Converter {
private final ConverterLookup lookup;
- private final ClassLoader loader;
+ private final ClassLoaderReference loader;
private final Class<?> defaultImpl = String.class;
- public ObjectWithDefaultStringImplConverter(ConverterLookup lookup, ClassLoader loader) {
+ public ObjectWithDefaultStringImplConverter(ConverterLookup lookup, ClassLoaderReference loader) {
this.lookup = lookup;
this.loader = loader;
}
@@ -78,7 +79,7 @@ public class ObjectWithDefaultStringImplConverter implements Converter {
clazz = Boxing.getPrimitiveType(clazzName).get();
} else {
try {
- clazz = loader.loadClass(clazzName);
+ clazz = loader.getReference().loadClass(clazzName);
} catch (ClassNotFoundException e) {
throw Exceptions.propagate(e);
}
[2/2] brooklyn-server git commit: This closes #633
Posted by m4...@apache.org.
This closes #633
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f2e86909
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f2e86909
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f2e86909
Branch: refs/heads/master
Commit: f2e86909c588ee80872a20fc11aaf03e20fec83a
Parents: 1772845 d350f70
Author: Mark McKenna <m4...@gmail.com>
Authored: Thu Apr 13 14:20:39 2017 +0100
Committer: Mark McKenna <m4...@gmail.com>
Committed: Thu Apr 13 14:20:39 2017 +0100
----------------------------------------------------------------------
.../core/xstream/ObjectWithDefaultStringImplConverter.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------