From 4a0b740e8001ae0bdcde0b8d10ec156404ccac5b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 2 Jan 2015 16:35:08 +0100
Subject: [PATCH] =?UTF-8?q?continue=20firefox=20rdp=20=E2=80=94=20handle?=
 =?UTF-8?q?=20frameUpdate(destroyAll=3Dtrue)=20event,=20init=20break=20sup?=
 =?UTF-8?q?port,=20handle=20newSource=20event?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/src/org/jetbrains/debugger/SuspendContext.java    | 2 +-
 .../src/org/jetbrains/debugger/SuspendContextManager.java     | 2 +-
 .../src/org/jetbrains/debugger/SuspendContextManagerBase.java | 4 ++--
 .../src/org/jetbrains/debugger/frame/ExecutionStackImpl.java  | 2 +-
 .../src/org/jetbrains/protocolReader/FieldProcessor.java      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContext.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContext.java
index 4c77dcff0107..de6389ee2cac 100755
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContext.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContext.java
@@ -32,7 +32,7 @@ public interface SuspendContext {
    * Call frames for the current suspended state (from the innermost (top) frame to the main (bottom) frame)
    */
   @NotNull
-  Promise<CallFrame[]> getCallFrames();
+  Promise<CallFrame[]> getFrames();
 
   /**
    * @return a set of the breakpoints hit on VM suspension with which this
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManager.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManager.java
index b39f6f38496c..479774d9c57b 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManager.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManager.java
@@ -10,7 +10,7 @@ public interface SuspendContextManager<CALL_FRAME extends CallFrame> {
    * will be called.
    */
   @NotNull
-  Promise<Void> suspend();
+  Promise<?> suspend();
 
   @Nullable
   SuspendContext getContext();
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManagerBase.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManagerBase.java
index 16610b84295a..ce3b97bd128e 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManagerBase.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/SuspendContextManagerBase.java
@@ -43,7 +43,7 @@ public abstract class SuspendContextManagerBase<T extends SuspendContextBase, CA
 
   @NotNull
   @Override
-  public final Promise<Void> suspend() {
+  public final Promise<?> suspend() {
     Promise<Void> callback = suspendCallback.get();
     if (callback != null) {
       return callback;
@@ -56,7 +56,7 @@ public abstract class SuspendContextManagerBase<T extends SuspendContextBase, CA
   }
 
   @NotNull
-  protected abstract Promise<Void> doSuspend();
+  protected abstract Promise<?> doSuspend();
 
   @Override
   public boolean isContextObsolete(@NotNull SuspendContext context) {
diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/ExecutionStackImpl.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/ExecutionStackImpl.java
index 033efead7dae..05a69106287d 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/ExecutionStackImpl.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/ExecutionStackImpl.java
@@ -42,7 +42,7 @@ public class ExecutionStackImpl extends XExecutionStack {
       return;
     }
 
-    suspendContext.getCallFrames().done(new ContextDependentAsyncResultConsumer<CallFrame[]>(suspendContext) {
+    suspendContext.getFrames().done(new ContextDependentAsyncResultConsumer<CallFrame[]>(suspendContext) {
       @Override
       protected void consume(CallFrame[] frames, @NotNull Vm vm) {
         int count = frames.length - firstFrameIndex;
diff --git a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
index 3925239a98d2..1acdee3f8f8f 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
+++ b/platform/script-debugger/protocol/protocol-reader/src/org/jetbrains/protocolReader/FieldProcessor.java
@@ -67,7 +67,7 @@ final class FieldProcessor<T> {
     if (method.getAnnotation(JsonNullable.class) != null) {
       nullable = true;
     }
-    else if (genericReturnType == String.class || genericReturnType == Enum.class) {
+    else if (genericReturnType == String.class || genericReturnType == Enum.class || (genericReturnType instanceof Class && !((Class)genericReturnType).isPrimitive())) {
       JsonField jsonField = method.getAnnotation(JsonField.class);
       if (jsonField != null) {
         nullable = jsonField.optional() && !jsonField.allowAnyPrimitiveValue() && !jsonField.allowAnyPrimitiveValueAndMap();