[gwt-contrib] [google-web-toolkit] r9780 committed - RpcLogArtifact tweaked to use the canonical diskCache method, simplifi...

[codesite-noreply]

Revision: 9780
Author: sco...@google.com
Date: Mon Feb 28 10:17:04 2011
Log: RpcLogArtifact tweaked to use the canonical diskCache method,  
simplifies transition to EmittedArtifact.

http://gwt-code-reviews.appspot.com/1366801/

Review by: robertvaw...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=9780

Modified:
 /trunk/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
 /trunk/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java

=======================================
--- /trunk/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java	Wed  
Feb 16 11:06:56 2011
+++ /trunk/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java	Mon  
Feb 28 10:17:04 2011
@@ -15,15 +15,10 @@
  */
 package com.google.gwt.user.linker.rpc;

-import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.linker.Artifact;
 import com.google.gwt.dev.util.DiskCache;
-import com.google.gwt.dev.util.Util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;

@@ -54,8 +49,8 @@
   /**
    * @param logger a TreeLogger
    */
-  public InputStream getContents(TreeLogger logger) {
-    return new  
ByteArrayInputStream(diskCache.readByteArray(diskCacheToken));
+  public byte[] getContents() {
+    return diskCache.readByteArray(diskCacheToken);
   }

   public String getQualifiedSourceName() {
@@ -89,9 +84,7 @@
   private void readObject(ObjectInputStream stream) throws IOException,
       ClassNotFoundException {
     stream.defaultReadObject();
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    Util.copyNoClose(stream, baos);
-    diskCacheToken = diskCache.writeByteArray(baos.toByteArray());
+    diskCacheToken = diskCache.transferFromStream(stream);
   }

   private void writeObject(ObjectOutputStream stream) throws IOException {
=======================================
--- /trunk/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java	Thu  
Oct 28 11:37:15 2010
+++ /trunk/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java	Mon  
Feb 28 10:17:04 2011
@@ -57,9 +57,9 @@
              */
             policyStrongName = result.getStrongName();
           }
-          EmittedArtifact art = emitInputStream(logger,
-              logArt.getContents(logger), logArt.getQualifiedSourceName()  
+ "-"
-                  + policyStrongName + ".rpc.log");
+          EmittedArtifact art = emitBytes(logger, logArt.getContents(),
+              logArt.getQualifiedSourceName() + "-" + policyStrongName
+                  + ".rpc.log");
           art.setVisibility(Visibility.Private);
           toReturn.add(art);
         }

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors