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/17 11:08:01 UTC
[2/4] git commit: White space tidies
White space tidies
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/18f633f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/18f633f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/18f633f3
Branch: refs/heads/master
Commit: 18f633f3921b92754663bf5c5f8cf34ec1911ac9
Parents: e832afb
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 16 15:35:36 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 16 16:22:49 2014 +0100
----------------------------------------------------------------------
.../brooklyn/management/internal/AbstractManagementContext.java | 2 +-
core/src/main/java/brooklyn/util/task/BasicExecutionManager.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/18f633f3/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
index 860e5d4..2eb695a 100644
--- a/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
+++ b/core/src/main/java/brooklyn/management/internal/AbstractManagementContext.java
@@ -81,7 +81,7 @@ import com.google.common.base.Throwables;
public abstract class AbstractManagementContext implements ManagementContextInternal {
private static final Logger log = LoggerFactory.getLogger(AbstractManagementContext.class);
- private static DataGridFactory loadDataGridFactory(BrooklynProperties properties){
+ private static DataGridFactory loadDataGridFactory(BrooklynProperties properties) {
String clazzName = properties.getFirst(DataGridFactory.class.getName());
if(clazzName == null){
clazzName = InMemoryDataGridFactory.class.getName();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/18f633f3/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java b/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java
index a36124e..a9d6a46 100644
--- a/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java
+++ b/core/src/main/java/brooklyn/util/task/BasicExecutionManager.java
@@ -124,7 +124,7 @@ public class BasicExecutionManager implements ExecutionManager {
.build();
// use Executors.newCachedThreadPool(daemonThreadFactory), but timeout of 1s rather than 60s for better shutdown!
- runner = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 1L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(),
+ runner = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 10L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(),
daemonThreadFactory);
delayedRunner = new ScheduledThreadPoolExecutor(1, daemonThreadFactory);
@@ -138,7 +138,7 @@ public class BasicExecutionManager implements ExecutionManager {
protected ThreadFactory newThreadFactory(String contextid) {
return new ThreadFactoryBuilder()
.setNameFormat("brooklyn-execmanager-"+contextid+"-%d")
- .setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler(){
+ .setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread t, Throwable e) {
log.error("Uncaught exception in thread "+t.getName(), e);