am 2533132c: Merge change Ic29d3eac into eclair

Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-plus-aosp

* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
  Server validates even though server address is wrong DO NOT MERGE
This commit is contained in:
Marc Blank 2009-10-28 11:04:30 -07:00 committed by Android Git Automerger
commit 259386b10b

View File

@ -208,6 +208,12 @@ public class EasSyncService extends AbstractSyncService {
userLog("Validation (OPTIONS) response: " + code); userLog("Validation (OPTIONS) response: " + code);
if (code == HttpStatus.SC_OK) { if (code == HttpStatus.SC_OK) {
// No exception means successful validation // No exception means successful validation
Header commands = resp.getFirstHeader("MS-ASProtocolCommands");
Header versions = resp.getFirstHeader("ms-asprotocolversions");
if (commands == null || versions == null) {
userLog("OPTIONS response without commands or versions; reporting I/O error");
throw new MessagingException(MessagingException.IOERROR);
}
userLog("Validation successful"); userLog("Validation successful");
return; return;
} }