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/09/07 23:28:53 UTC
[4/8] git commit: CatalogLibrariesDo: minor tidy
CatalogLibrariesDo: minor tidy
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b4930769
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b4930769
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b4930769
Branch: refs/heads/master
Commit: b4930769930d8dbfef39e241f29e32f5efe7c3d3
Parents: 85f547e
Author: Aled Sage <al...@gmail.com>
Authored: Fri Sep 5 20:17:36 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Sep 5 21:52:51 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/internal/CatalogLibrariesDo.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b4930769/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java
index 2a9fdbc..d967e3b 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java
@@ -59,15 +59,14 @@ public class CatalogLibrariesDo implements CatalogItem.CatalogItemLibraries {
Maybe<OsgiManager> osgi = mgmt.getOsgiManager();
if (osgi.isAbsent()) {
throw new IllegalStateException("Unable to load bundles "+bundles+" because OSGi is not running.");
- } else if (LOG.isDebugEnabled()) {
- LOG.debug("{} loading bundles in {}: {}",
- new Object[]{this, managementContext, Joiner.on(", ").join(bundles)});
}
+ if (LOG.isDebugEnabled()) LOG.debug("{} loading bundles in {}: {}",
+ new Object[] {this, managementContext, Joiner.on(", ").join(bundles)});
Stopwatch timer = Stopwatch.createStarted();
for (String bundleUrl : bundles) {
osgi.get().registerBundle(bundleUrl);
}
- LOG.debug("{} registered {} bundles in {}",
+ if (LOG.isDebugEnabled()) LOG.debug("{} registered {} bundles in {}",
new Object[]{this, bundles.size(), Time.makeTimeStringRounded(timer)});
}
}