CLEANUP: Remove TranscoderService from asyncGet()

src/main/java/net/spy/memcached/MemcachedClient.java

@@ -51,6 +51,7 @@
 import net.spy.memcached.internal.GetFuture;
 import net.spy.memcached.internal.OperationFuture;
 import net.spy.memcached.internal.SingleElementInfiniteIterator;
+import net.spy.memcached.internal.result.GetResult;
 import net.spy.memcached.ops.CASOperationStatus;
 import net.spy.memcached.ops.CancelledOperationStatus;
 import net.spy.memcached.ops.ConcatenationType;
@@ -887,29 +888,28 @@ public OperationFuture<Boolean> replace(String key, int exp, Object o) {
   public <T> GetFuture<T> asyncGet(final String key, final Transcoder<T> tc) {
 
     final CountDownLatch latch = new CountDownLatch(1);
-    final GetFuture<T> rv = new GetFuture<T>(latch, operationTimeout);
+    final GetFuture<T> future = new GetFuture<T>(latch, operationTimeout);
 
     Operation op = opFact.get(key,
         new GetOperation.Callback() {
-          private Future<T> val = null;
+          private final GetResult<T> result = new GetResult<T>(tc);
 
           public void receivedStatus(OperationStatus status) {
-            rv.set(val, status);
+            future.set(result, status);
           }
 
           public void gotData(String k, int flags, byte[] data) {
             assert key.equals(k) : "Wrong key returned";
-            val = tcService.decode(tc,
-                    new CachedData(flags, data, tc.getMaxSize()));
+            result.setCachedData(new CachedData(flags, data, tc.getMaxSize()));
           }
 
           public void complete() {
             latch.countDown();
           }
         });
-    rv.setOperation(op);
+    future.setOperation(op);
     addOp(key, op);
-    return rv;
+    return future;
   }
 
   /**

src/main/java/net/spy/memcached/internal/GetFuture.java

@@ -6,6 +6,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import net.spy.memcached.internal.result.GetResult;
 import net.spy.memcached.ops.Operation;
 import net.spy.memcached.ops.OperationStatus;
 
@@ -18,10 +19,10 @@
  */
 public class GetFuture<T> implements Future<T> {
 
-  private final OperationFuture<Future<T>> rv;
+  private final OperationFuture<GetResult<T>> rv;
 
   public GetFuture(CountDownLatch l, long opTimeout) {
-    this.rv = new OperationFuture<Future<T>>(l, opTimeout);
+    this.rv = new OperationFuture<GetResult<T>>(l, opTimeout);
   }
 
   public GetFuture(GetFuture<T> parent) {
@@ -33,22 +34,22 @@ public boolean cancel(boolean ign) {
   }
 
   public T get() throws InterruptedException, ExecutionException {
-    Future<T> decodedTask = rv.get();
-    return decodedTask == null ? null : decodedTask.get();
+    GetResult<T> result = rv.get();
+    return result == null ? null : result.getDecodedValue();
   }
 
   public T get(long duration, TimeUnit units)
           throws InterruptedException, TimeoutException, ExecutionException {
-    Future<T> decodedTask = rv.get(duration, units);
-    return decodedTask == null ? null : decodedTask.get();
+    GetResult<T> result = rv.get(duration, units);
+    return result == null ? null : result.getDecodedValue();
   }
 
   public OperationStatus getStatus() {
     return rv.getStatus();
   }
 
-  public void set(Future<T> decodedTask, OperationStatus status) {
-    rv.set(decodedTask, status);
+  public void set(GetResult<T> result, OperationStatus status) {
+    rv.set(result, status);
   }
 
   public void setOperation(Operation to) {

src/main/java/net/spy/memcached/internal/result/GetResult.java

@@ -0,0 +1,31 @@
+package net.spy.memcached.internal.result;
+
+import net.spy.memcached.CachedData;
+import net.spy.memcached.transcoders.Transcoder;
+
+public final class GetResult<T> {
+  private final Transcoder<T> transcoder;
+
+  private volatile CachedData cachedData = null;
+  private volatile T decodedValue = null;
+
+  public GetResult(Transcoder<T> transcoder) {
+    this.transcoder = transcoder;
+  }
+
+  public void setCachedData(CachedData cachedData) {
+    this.cachedData = cachedData;
+  }
+
+  public T getDecodedValue() {
+    if (cachedData == null) {
+      return null;
+    }
+
+    if (decodedValue == null) {
+      decodedValue = transcoder.decode(cachedData);
+    }
+
+    return decodedValue;
+  }
+}