You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/12/04 19:33:31 UTC
[1/2] incubator-brooklyn git commit: tryLoadClass: return
optional.absent on NoClassDefFoundError
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 27d7b7843 -> 89440c303
tryLoadClass: return optional.absent on NoClassDefFoundError
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/68cd3860
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/68cd3860
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/68cd3860
Branch: refs/heads/master
Commit: 68cd3860d2428381c36721c1b322b1fec69da536
Parents: 5809a07
Author: Aled Sage <al...@gmail.com>
Authored: Wed Dec 2 16:41:41 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Dec 4 10:01:41 2015 +0000
----------------------------------------------------------------------
.../mgmt/classloading/JavaBrooklynClassLoadingContext.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68cd3860/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
index 51007d7..064ba03 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
@@ -27,14 +27,19 @@ import java.util.Collections;
import java.util.Enumeration;
import org.apache.brooklyn.api.mgmt.ManagementContext;
+import org.apache.brooklyn.core.entity.AbstractEntity;
import org.apache.brooklyn.core.mgmt.persist.DeserializingClassRenamesProvider;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.guava.Maybe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Objects;
public class JavaBrooklynClassLoadingContext extends AbstractBrooklynClassLoadingContext {
+ private static final Logger LOG = LoggerFactory.getLogger(JavaBrooklynClassLoadingContext.class);
+
// on deserialization this loader is replaced with the catalog's root loader;
// may cause problems for non-osgi catalog items, but that's a reasonable trade-off,
// should this be serialized (e.g. in SpecialFlagsTransformer) in such a case!
@@ -82,6 +87,10 @@ public class JavaBrooklynClassLoadingContext extends AbstractBrooklynClassLoadin
try {
className = DeserializingClassRenamesProvider.findMappedName(className);
return (Maybe) Maybe.of(getClassLoader().loadClass(className));
+ } catch (NoClassDefFoundError e) {
+ String msg = "Invalid linkage in (transitive dependencies of) class "+className+": "+e.toString();
+ LOG.debug(msg);
+ return Maybe.absent(msg, e);
} catch (Exception e) {
Exceptions.propagateIfFatal(e);
return Maybe.absent("Invalid class: "+className, e);
[2/2] incubator-brooklyn git commit: This closes #1089
Posted by al...@apache.org.
This closes #1089
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/89440c30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/89440c30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/89440c30
Branch: refs/heads/master
Commit: 89440c3032997c61e8fe3aee2e5eeef365846870
Parents: 27d7b78 68cd386
Author: Aled Sage <al...@gmail.com>
Authored: Fri Dec 4 18:33:16 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Dec 4 18:33:16 2015 +0000
----------------------------------------------------------------------
.../mgmt/classloading/JavaBrooklynClassLoadingContext.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------