Merge change I15dccd1f into eclair-mr2

* changes:
  Server validates even though server address is wrong
This commit is contained in:
Android (Google) Code Review 2009-10-08 11:15:46 -04:00
commit 676ea183bd

View File

@ -209,6 +209,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;
} }