You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2020/11/24 19:59:08 UTC
[brooklyn-server] 03/04: fix periodic thread logging if no timeout
specified, as per PR review
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 715ef7c06e36ad25a903f4624cdab742e74721b6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Nov 24 19:57:56 2020 +0000
fix periodic thread logging if no timeout specified, as per PR review
---
.../java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java
index 6e23e7a..56b24cf 100644
--- a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java
+++ b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherImpl.java
@@ -176,15 +176,12 @@ public class OsgiLauncherImpl extends BasicLauncher<OsgiLauncherImpl> implements
throw Exceptions.propagateAnnotated("Invalid duration specified for '"+BROOKLYN_OSGI_DEPENDENCIES_SERVICES_TIMEOUT+"'", e);
}
fallbackThread = new Thread(() -> {
- if (timeout==null) {
- LOG.debug("No timeout specified for '"+BROOKLYN_OSGI_DEPENDENCIES_SERVICES_TIMEOUT+"'; will wait indefinitely for service dependencies");
- return;
- }
-
CountdownTimer timer = timeout==null ? null : CountdownTimer.newInstanceStarted(timeout);
try {
if (timeout!=null) {
LOG.debug("Service dependencies timeout detected as " + timeout + "; will start catalog/rebind after that delay if service dependencies not fulfilled sooner");
+ } else {
+ LOG.debug("No timeout specified for '"+BROOKLYN_OSGI_DEPENDENCIES_SERVICES_TIMEOUT+"'; will wait indefinitely for service dependencies");
}
int iteration = 0;
do {