[gwt-contrib] RpcLogArtifact tweak. (issue1366801)

[scottb]

Reviewers: bobv,

Description:
Uses the canonical diskCache method, simplifies transition to
EmittedArtifact.

Please review this at http://gwt-code-reviews.appspot.com/1366801/

Affected files:
  M user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
  M user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java


Index: user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
diff --git a/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java  
b/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
index  
0b2b00f4206c900fe870bcb3afb9052761b3d704..f326cf32ebd11f3812137d562c2c99cebc13e61b  
100644
--- a/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
+++ b/user/src/com/google/gwt/user/linker/rpc/RpcLogArtifact.java
@@ -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 @@ public class RpcLogArtifact extends  
Artifact<RpcLogArtifact> {
   /**
    * @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 @@ public class RpcLogArtifact extends  
Artifact<RpcLogArtifact> {
   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 {
Index: user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java
diff --git a/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java  
b/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java
index  
91c58d5d47d69c79ba344251d94a5f604cf3ca10..cd0a3aa85ea8312e5ad9d61a5b54c4ab6aebf66d  
100644
--- a/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java
+++ b/user/src/com/google/gwt/user/linker/rpc/RpcLogLinker.java
@@ -57,9 +57,9 @@ public class RpcLogLinker extends AbstractLinker {
              */
             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