Revision: 7074 Author: sp...@google.com Date: Fri Nov 20 12:23:47 2009 Log: Merging tr...@7014 into releases/2.0 . Merge command used:
svn merge -c 7014 --ignore-ancestry https://google-web-toolkit.googlecode.com/svn/trunk . http://code.google.com/p/google-web-toolkit/source/detail?r=7074 Modified: /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java Wed Nov 11 11:04:31 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java Fri Nov 20 12:23:47 2009 @@ -191,7 +191,7 @@ diskCache.transferToStream(serializedAstToken, stream); } else if (initialAst != null) { // Serialize into raw bytes. - Util.writeObjectToStream(stream, stream); + Util.writeObjectToStream(stream, initialAst); } else { throw new IllegalStateException( "No serialized AST was cached and AST was already consumed."); -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
