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 2014/07/09 23:46:58 UTC
[45/50] git commit: address @aledsage review comments from today,
including fixing ResourceUtils constructor
address @aledsage review comments from today, including fixing ResourceUtils constructor
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/21afbc29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/21afbc29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/21afbc29
Branch: refs/heads/master
Commit: 21afbc2988c85ffc697e3dc5178e39169aa06fa2
Parents: df48761
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 9 12:01:23 2014 -0400
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:47 2014 +0100
----------------------------------------------------------------------
core/src/main/java/brooklyn/management/ha/OsgiManager.java | 4 ++--
core/src/main/java/brooklyn/util/ResourceUtils.java | 1 +
core/src/test/resources/brooklyn/osgi/README.md | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/21afbc29/core/src/main/java/brooklyn/management/ha/OsgiManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/ha/OsgiManager.java b/core/src/main/java/brooklyn/management/ha/OsgiManager.java
index d0447c8..c672969 100644
--- a/core/src/main/java/brooklyn/management/ha/OsgiManager.java
+++ b/core/src/main/java/brooklyn/management/ha/OsgiManager.java
@@ -117,7 +117,7 @@ public class OsgiManager {
} else {
bundleProblems.put(bundleUrlOrNameVersionString, new IllegalStateException("Unable to find bundle "+bundleUrlOrNameVersionString));
}
- } catch (Throwable e) {
+ } catch (Exception e) {
Exceptions.propagateIfFatal(e);
bundleProblems.put(bundleUrlOrNameVersionString, e);
}
@@ -138,7 +138,7 @@ public class OsgiManager {
URL result = bundle.get().getResource(name);
if (result!=null) return result;
}
- } catch (Throwable e) {
+ } catch (Exception e) {
Exceptions.propagateIfFatal(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/21afbc29/core/src/main/java/brooklyn/util/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/ResourceUtils.java b/core/src/main/java/brooklyn/util/ResourceUtils.java
index bdda6df..347ecbb 100644
--- a/core/src/main/java/brooklyn/util/ResourceUtils.java
+++ b/core/src/main/java/brooklyn/util/ResourceUtils.java
@@ -131,6 +131,7 @@ public class ResourceUtils {
}
public ResourceUtils(ClassLoader loader, Object contextObject, String contextMessage) {
+ this(new JavaBrooklynClassLoadingContext(null, loader), contextObject, contextMessage);
}
public ResourceUtils(BrooklynClassLoadingContext loader, Object contextObject, String contextMessage) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/21afbc29/core/src/test/resources/brooklyn/osgi/README.md
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/osgi/README.md b/core/src/test/resources/brooklyn/osgi/README.md
index 5db7db2..ad6e4d3 100644
--- a/core/src/test/resources/brooklyn/osgi/README.md
+++ b/core/src/test/resources/brooklyn/osgi/README.md
@@ -1 +1 @@
-Sampe OSGi bundle files included here, either are built from /src/dependencies in this project, or contain their sources, or both.
+Sample OSGi bundle files included here, either are built from /src/dependencies in this project, or contain their sources, or both.