<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -29,7 +29,7 @@ module OpenIDDataMapper
         a = assoc.from_record    
         if a.expires_in == 0
           # assoc.destroy
-          assoc.destroy!
+          assoc.destroy
         else
           return a
         end
@@ -40,7 +40,7 @@ module OpenIDDataMapper
 
     def remove_association(server_url, handle)
       # Association.delete_all(['server_url = ? AND handle = ?', server_url, handle]) &gt; 0
-      Association.all(:server_url =&gt; server_url, :handle =&gt; handle).destroy!
+      Association.all(:server_url =&gt; server_url, :handle =&gt; handle).destroy
     end
 
     def use_nonce(server_url, timestamp, salt)
@@ -54,13 +54,13 @@ module OpenIDDataMapper
     def cleanup_nonces
       now = Time.now.to_i
       # Nonce.delete_all([&quot;timestamp &gt; ? OR timestamp &lt; ?&quot;, now + OpenID::Nonce.skew, now - OpenID::Nonce.skew])
-      Nonce.all(:conditions =&gt; [&quot;timestamp &gt; ? OR timestamp &lt; ?&quot;, now + OpenID::Nonce.skew, now - OpenID::Nonce.skew]).destroy!
+      Nonce.all(:conditions =&gt; [&quot;timestamp &gt; ? OR timestamp &lt; ?&quot;, now + OpenID::Nonce.skew, now - OpenID::Nonce.skew]).destroy
     end
 
     def cleanup_associations
       now = Time.now.to_i
       # Association.delete_all(['issued + lifetime &gt; ?',now])
-      Association.all(:conditions =&gt; ['issued + lifetime &gt; ?', now]).destroy!
+      Association.all(:conditions =&gt; ['issued + lifetime &gt; ?', now]).destroy
     end
 
   end</diff>
      <filename>gems/gems/openid_dm_store-0.1.1/lib/openid_dm_store.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>822b19544c1e095ab22a9f7250332c718b43d214</id>
    </parent>
  </parents>
  <author>
    <name>Jed Hurt</name>
    <email>jedhurt@cableone.net</email>
  </author>
  <url>http://github.com/meekish/collective/commit/b97d2cbe2b6062848a149b57fc5b2d7fc4fc1a08</url>
  <id>b97d2cbe2b6062848a149b57fc5b2d7fc4fc1a08</id>
  <committed-date>2008-09-16T20:56:08-07:00</committed-date>
  <authored-date>2008-09-16T20:56:08-07:00</authored-date>
  <message>Replaced calls to #destroy! with #destroy</message>
  <tree>855674d89d8ccd93ee1963399ca1741f897b9140</tree>
  <committer>
    <name>Jed Hurt</name>
    <email>jedhurt@cableone.net</email>
  </committer>
</commit>
