Merge remote-tracking branch 'origin/master' into bug2610

This commit is contained in:
fmittag committed 2015-12-18 16:13:58 +01:00
commit caae9a587a
14 files changed
+422 -158

No files matched your search

@@ -19,9 +19,9 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
*/
public class AsyncActionsExecutor {
private class ExecutionJob<T> implements AsyncCallback<T> {
private AsyncAction<T> action;
private String category;
private AsyncCallback<T> callback;
private final AsyncAction<T> action;
private final String category;
private final AsyncCallback<T> callback;
public ExecutionJob(AsyncAction<T> action, String category, AsyncCallback<T> callback) {
this.action = action;
@@ -51,8 +51,7 @@ public final class MarkedAsyncCallback<T> implements AsyncCallback<T> {
public MarkedAsyncCallback(AsyncCallback<T> callback, String category) {
this.callback = callback;
this.category = category;
if(DebugInfo.isDebugIdEnabled()) {
if (DebugInfo.isDebugIdEnabled()) {
PendingAjaxCallMarker.incrementPendingAjaxCalls(this.category);
}
}
@@ -70,7 +69,7 @@ public final class MarkedAsyncCallback<T> implements AsyncCallback<T> {
try {
this.callback.onFailure(cause);
} finally {
if(DebugInfo.isDebugIdEnabled()) {
if (DebugInfo.isDebugIdEnabled()) {
PendingAjaxCallMarker.decrementPendingAjaxCalls(this.category);
}
}
@@ -89,7 +88,7 @@ public final class MarkedAsyncCallback<T> implements AsyncCallback<T> {
try {
this.callback.onSuccess(result);
} finally {
if(DebugInfo.isDebugIdEnabled()) {
if (DebugInfo.isDebugIdEnabled()) {
PendingAjaxCallMarker.decrementPendingAjaxCalls(this.category);
}
}