Minor cleanups, removing some debug stuff that snuck into the previous commit.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1237 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/extensions/service/src/com/google/inject/service/AsyncService.java b/extensions/service/src/com/google/inject/service/AsyncService.java
index 8672c0b..325606a 100644
--- a/extensions/service/src/com/google/inject/service/AsyncService.java
+++ b/extensions/service/src/com/google/inject/service/AsyncService.java
@@ -18,7 +18,6 @@
import com.google.inject.internal.util.Preconditions;
import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
@@ -54,16 +53,12 @@
return new FutureTask<State>(NOOP, State.STARTED);
}
- final Future<State> task = executor.submit(new Callable<State>() {
+ return executor.submit(new Callable<State>() {
public State call() {
onStart();
return state = State.STARTED;
}
});
-
- return task;
- // Wrap it in another future to catch failures.
-// return new FutureTask<State>(futureGet(task));
}
/**
@@ -83,18 +78,12 @@
return new FutureTask<State>(NOOP, State.STOPPED);
}
- // TODO Should we bother doing the wrap, or is it enough to return
- // this future as is?
- final Future<State> task = executor.submit(new Callable<State>() {
+ return executor.submit(new Callable<State>() {
public State call() {
onStop();
return state = State.STOPPED;
}
});
-
- // Wrap it in another future to catch failures.
- return task;
-// return new FutureTask<State>(futureGet(task));
}
/**
@@ -109,23 +98,4 @@
public final State state() {
return state;
}
-
- /**
- * Returns a runnable that when run will get() the given future and
- * update {@link #state} to FAILED if there was an exception thrown.
- */
- private Callable<State> futureGet(final Future<State> task) {
- return new Callable<State>() {
- public State call() {
- try {
- System.out.println("FutureGEtting");
- return task.get();
- } catch (InterruptedException e) {
- return state = State.FAILED;
- } catch (ExecutionException e) {
- return state = State.FAILED;
- }
- }
- };
- }
}
diff --git a/extensions/service/src/com/google/inject/service/CompositeService.java b/extensions/service/src/com/google/inject/service/CompositeService.java
index 8e578c6..2fea9d5 100644
--- a/extensions/service/src/com/google/inject/service/CompositeService.java
+++ b/extensions/service/src/com/google/inject/service/CompositeService.java
@@ -104,13 +104,10 @@
final Service.State state) {
return new FutureTask<Service.State>(new Callable<Service.State>() {
public Service.State call() {
- System.out.println("GeT :--- ");
boolean ok = true;
for (Future<Service.State> task : tasks) {
try {
- System.out.println("GeT : " + task);
ok = state == task.get();
- System.out.println("OK : " + task);
} catch (InterruptedException e) {
return compositeState = Service.State.FAILED;
} catch (ExecutionException e) {
