Merge pull request #913 from chriseth/auction

Updated the function withdraw() in the SimpleAuction and BlindAuction…

1 files changed, 29 insertions, 15 deletions

diff --git a/docs/solidity-by-example.rst b/docs/solidity-by-example.rst
index 86d6f72b..61589b2e 100644
--- a/docs/solidity-by-example.rst
+++ b/docs/solidity-by-example.rst
@@ -280,14 +280,21 @@ activate themselves.
         }
 
         /// Withdraw a bid that was overbid.
-        function withdraw() {
+        function withdraw() returns (bool) {
             var amount = pendingReturns[msg.sender];
-            // It is important to set this to zero because the recipient
-            // can call this function again as part of the receiving call
-            // before `send` returns.
-            pendingReturns[msg.sender] = 0;
-            if (!msg.sender.send(amount))
-                throw; // If anything fails, this will revert the changes above
+            if (amount > 0) {
+                // It is important to set this to zero because the recipient
+                // can call this function again as part of the receiving call
+                // before `send` returns.
+                pendingReturns[msg.sender] = 0;
+
+                if (!msg.sender.send(amount)) { 
+                    // No need to call throw here, just reset the amount owing
+                    pendingReturns[msg.sender] = amount;
+                    return false;
+                }
+            }
+            return true;
         }
 
         /// End the auction and send the highest bid
@@ -491,15 +498,22 @@ high or low invalid bids.
         }
 
         /// Withdraw a bid that was overbid.
-        function withdraw() {
+        function withdraw() returns (bool) {
             var amount = pendingReturns[msg.sender];
-            // It is important to set this to zero because the recipient
-            // can call this function again as part of the receiving call
-            // before `send` returns (see the remark above about
-            // conditions -> effects -> interaction).
-            pendingReturns[msg.sender] = 0;
-            if (!msg.sender.send(amount))
-                throw; // If anything fails, this will revert the changes above
+            if (amount > 0) {
+                // It is important to set this to zero because the recipient
+                // can call this function again as part of the receiving call
+                // before `send` returns (see the remark above about
+                // conditions -> effects -> interaction).
+                pendingReturns[msg.sender] = 0;
+
+                if (!msg.sender.send(amount)){
+                    // No need to call throw here, just reset the amount owing
+                    pendingReturns[msg.sender] = amount;
+                    return false;
+                }
+            }
+            return true;
         }
 
         /// End the auction and send the highest bid