commit a982b973a6415b911adc8278ce48d908a0b7a8b9
author Shawn O. Pearce <sop@google.com> Mon Aug 24 15:04:44 2009 -0700
committer Shawn O. Pearce <sop@google.com> Mon Aug 24 15:04:44 2009 -0700
tree adce2012bd68d8177c98581e2947bf14eefa0787
parent e4ab5c93432f43091b489be83dbce3fb71eaa03d

Correctly catch "Invalid xsrfKey in request" error as "Not Signed In"

We were testing for the wrong exception type, resulting in this code
not matching the error message as we expected.  gwtjsonrpc throws an
InvocationException when the XSRF token is invalid.

Bug: GERRIT-265
Change-Id: Ifa7aa66f84c1d41a89ff3625975f52f6406da575
Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gerrit/client/rpc/GerritCallback.java

diff --git a/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java b/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
index 8202c2b..8d85ae5 100644
--- a/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
+++ b/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
@@ -18,6 +18,7 @@
 import com.google.gerrit.client.Gerrit;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.rpc.InvocationException;
 import com.google.gwtjsonrpc.client.JsonUtil;
 import com.google.gwtjsonrpc.client.RemoteJsonException;
 import com.google.gwtjsonrpc.client.ServerUnavailableException;
@@ -51,7 +52,7 @@
   }
 
   public static boolean isInvalidXSRF(final Throwable caught) {
-    return caught instanceof RemoteJsonException
+    return caught instanceof InvocationException
         && caught.getMessage().equals(JsonUtil.ERROR_INVALID_XSRF);
   }