From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Sat, 27 Oct 2007 19:32:14 +0000 (+0000)
Subject: imap bugfix: out of sync source throws an exception (thanks to Ian Taylor)
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=4d7bcedd7c366568ba19a0a58e3210614bfc22c0;p=sup

imap bugfix: out of sync source throws an exception (thanks to Ian Taylor)

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@627 5c8cc53c-5e98-4d25-b20a-d8db53a31250
---

diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb
index 4cc7b2e..c74b0e5 100644
--- a/lib/sup/imap.rb
+++ b/lib/sup/imap.rb
@@ -270,8 +270,9 @@ private
   end
 
   def get_imap_fields id, *fields
-    imap_id = @imap_state[id][:id] or raise OutOfSyncSourceError, "Unknown message id #{id}"
+    raise OutOfSyncSourceError, "Unknown message id #{id}" unless @imap_state[id]
 
+    imap_id = @imap_state[id][:id]
     result = fetch(imap_id, (fields + ['RFC822.SIZE', 'INTERNALDATE']).uniq).first
     got_id = make_id result
     raise OutOfSyncSourceError, "IMAP message mismatch: requested #{id}, got #{got_id}." unless got_id == id