diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java
index 7c1086fc6e242d6ab26e34af01bd8b1847f0dc6a..7525b8a4a0485e76ec59116595f5168c3e5cc92d 100644
--- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java
+++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java
@@ -38,7 +38,8 @@ import com.alibaba.dubbo.remoting.exchange.Response;
 /**
  * DefaultFuture.
  * 
- * @author qian.lei
+ * @author qian.lei
+ * @author chao.liuc
  */
 public class DefaultFuture implements ResponseFuture {
 
@@ -110,8 +111,9 @@ public class DefaultFuture implements ResponseFuture {
     }
     
     public void cancel(){
-        response = new Response(id);
-        response.setErrorMessage("request future has been canceled.");
+        Response errorResult = new Response(id);
+        errorResult.setErrorMessage("request future has been canceled.");
+        response = errorResult ;
         FUTURES.remove(id);
         CHANNELS.remove(id);
     }
@@ -120,16 +122,39 @@ public class DefaultFuture implements ResponseFuture {
         return response != null;
     }
 
-    public void setCallback(ResponseCallback callback) {
-        if (isDone()) {
-            try {
-                callback.done(returnFromResponse());
-            } catch (Throwable e) {
-                callback.caught(e);
-            }
-        } else {
-            this.callback = callback;
+    public void setCallback(ResponseCallback callback) {
+        if (isDone()) {
+            invokeCallback(callback);
+        } else {
+            boolean isdone = false;
+            lock.lock();
+            try{
+                if (!isDone()) {
+                    this.callback = callback;
+                } else {
+                    isdone = true;
+                }
+            }finally {
+                lock.unlock();
+            }
+            if (isdone){
+                invokeCallback(callback);
+            }
         }
+    }
+    private void invokeCallback(ResponseCallback c){
+        if (c == null){
+            throw new NullPointerException("callback cannot be null.");
+        }
+        ResponseCallback callbackCopy = c;
+        c = null;
+        Object result = null;
+        try {
+            result = returnFromResponse();
+        } catch (Throwable e) {
+            callbackCopy.caught(e);
+        }
+        callbackCopy.done(result);
     }
 
     private long getId() {
@@ -198,14 +223,8 @@ public class DefaultFuture implements ResponseFuture {
         } finally {
             lock.unlock();
         }
-        ResponseCallback c = callback;
-        if (c != null) {
-            try {
-                c.done(returnFromResponse());
-            } catch (Throwable e) {
-                c.caught(e);
-            }
-            callback = null;
+        if (callback != null) {
+            invokeCallback(callback);
         }
     }
 
@@ -217,8 +236,6 @@ public class DefaultFuture implements ResponseFuture {
         if (res.getStatus() == Response.CLIENT_TIMEOUT || res.getStatus() == Response.SERVER_TIMEOUT) {
             throw new TimeoutException(res.getStatus() == Response.SERVER_TIMEOUT, channel, res.getErrorMessage());
         }
-        FUTURES.remove(id);
-        CHANNELS.remove(id);
         throw new RemotingException(channel, res.getErrorMessage());
     }