Author: [email protected]
Date: Tue Mar 10 09:25:10 2009
New Revision: 4970
Modified:
trunk/ (props changed)
trunk/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
Log:
Cherry-pick merging /releases/1.6 c4963 into trunk.
svn merge -c4963 https://google-web-toolkit.googlecode.com/svn/releases/1.6
Modified: trunk/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
==============================================================================
--- trunk/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java
(original)
+++ trunk/user/src/com/google/gwt/user/rebind/rpc/ProxyCreator.java Tue Mar
10 09:25:10 2009
@@ -445,21 +445,6 @@
w.println("(" + asyncParam.getName() + ");");
}
- JParameter callbackParam = asyncParams[asyncParams.length - 1];
- String callbackName = callbackParam.getName();
- if (needsTryCatchBlock) {
- w.outdent();
- w.print("} catch (SerializationException ");
- String exceptionName = nameFactory.createName("ex");
- w.println(exceptionName + ") {");
- w.indent();
- w.println(callbackName + ".onFailure(" + exceptionName + ");");
- w.outdent();
- w.println("}");
- }
-
- w.println();
-
String payloadName = nameFactory.createName("payload");
w.println("String " + payloadName + " = " + streamWriterName
+ ".toString();");
@@ -486,11 +471,24 @@
+ asyncReturnType.getQualifiedSourceName());
}
+ JParameter callbackParam = asyncParams[asyncParams.length - 1];
+ String callbackName = callbackParam.getName();
JType returnType = syncMethod.getReturnType();
w.print("ResponseReader." + getResponseReaderFor(returnType).name());
w.println(", \"" + getProxySimpleName() + "." + syncMethod.getName()
+ "\", " + requestIdName + ", " + payloadName + ", " + callbackName
+ ");");
+
+ if (needsTryCatchBlock) {
+ w.outdent();
+ w.print("} catch (SerializationException ");
+ String exceptionName = nameFactory.createName("ex");
+ w.println(exceptionName + ") {");
+ w.indent();
+ w.println(callbackName + ".onFailure(" + exceptionName + ");");
+ w.outdent();
+ w.println("}");
+ }
w.outdent();
w.println("}");
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
