cleanup

diff --git a/platform/script-debugger/backend/src/org/jetbrains/rpc/CommandSenderBase.java b/platform/script-debugger/backend/src/org/jetbrains/rpc/CommandSenderBase.java
index 598d298eac983ad547db76e906b15b4906f0acfa..41ecacf14420d816cd2b7018de019c2d4e44d4de 100644 (file)
--- a/platform/script-debugger/backend/src/org/jetbrains/rpc/CommandSenderBase.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/rpc/CommandSenderBase.java
@@ -25,9 +25,9 @@ public abstract class CommandSenderBase<SUCCESS_RESPONSE> implements CommandSend
     }
 
     @Override
-    public void onSuccess(SUCCESS_RESPONSE response, @Nullable ResultReader<SUCCESS_RESPONSE> resultReader) {
+    public void onSuccess(@Nullable SUCCESS_RESPONSE response, @Nullable ResultReader<SUCCESS_RESPONSE> resultReader) {
       try {
-        if (resultReader == null) {
+        if (resultReader == null || response == null) {
           //noinspection unchecked
           setResult((RESULT)response);
         }

diff --git a/platform/script-debugger/backend/src/org/jetbrains/rpc/RequestCallback.java b/platform/script-debugger/backend/src/org/jetbrains/rpc/RequestCallback.java
index 7cb90604389fdbba895ad428fc64eda2aed53424..409cff797923a401b6175a26421ad005c3b2889a 100644 (file)
--- a/platform/script-debugger/backend/src/org/jetbrains/rpc/RequestCallback.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/rpc/RequestCallback.java
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public interface RequestCallback<SUCCESS_RESPONSE> {
-  void onSuccess(SUCCESS_RESPONSE successResponse, @Nullable ResultReader<SUCCESS_RESPONSE> resultReader);
+  void onSuccess(@Nullable SUCCESS_RESPONSE successResponse, @Nullable ResultReader<SUCCESS_RESPONSE> resultReader);
 
   void onError(@NotNull Throwable error);
 }
\ No newline at end of file