Author: alexlehm
Date: 2008-05-20 21:10:04 +0000 (Tue, 20 May 2008)
New Revision: 19979
Modified:
trunk/apps/Freemail/src/freemail/AckProcrastinator.java
trunk/apps/Freemail/src/freemail/MailSite.java
trunk/apps/Freemail/src/freemail/OutboundContact.java
Log:
make a few error message more descriptive, mention the error code if we do not
mention e.g. collision
catch a null string access if the slot entry in undefined
Modified: trunk/apps/Freemail/src/freemail/AckProcrastinator.java
===================================================================
--- trunk/apps/Freemail/src/freemail/AckProcrastinator.java 2008-05-20
21:06:30 UTC (rev 19978)
+++ trunk/apps/Freemail/src/freemail/AckProcrastinator.java 2008-05-20
21:10:04 UTC (rev 19979)
@@ -112,6 +112,8 @@
} else if (err.errorcode ==
FCPInsertErrorMessage.COLLISION) {
acks[i].delete();
Logger.normal(this,"ACK
insertion to "+key+" successful");
+ } else {
+ Logger.error(this,"ACK
insertion to "+key+" failed (Errorcode: "+err.errorcode+")");
}
} catch (FCPBadFileException bfe) {
// won't occur
Modified: trunk/apps/Freemail/src/freemail/MailSite.java
===================================================================
--- trunk/apps/Freemail/src/freemail/MailSite.java 2008-05-20 21:06:30 UTC
(rev 19978)
+++ trunk/apps/Freemail/src/freemail/MailSite.java 2008-05-20 21:10:04 UTC
(rev 19979)
@@ -147,8 +147,11 @@
} else if (err.errorcode == FCPInsertErrorMessage.COLLISION) {
Logger.error(this,"Mailsite alias collided - somebody
is already using that alias! Choose another one!");
return false;
+ } else if (err.errorcode ==
FCPInsertErrorMessage.REJECTED_OVERLOAD) {
+ Logger.error(this,"Mailsite alias could not be inserted
(rejected overload), this is probably a temporary error");
+ return false;
} else {
- Logger.error(this,"Mailsite redirect insert failed, but
did not collide.");
+ Logger.error(this,"Mailsite redirect insert failed, but
did not collide. (errorcode="+err.errorcode+")");
return false;
}
}
Modified: trunk/apps/Freemail/src/freemail/OutboundContact.java
===================================================================
--- trunk/apps/Freemail/src/freemail/OutboundContact.java 2008-05-20
21:06:30 UTC (rev 19978)
+++ trunk/apps/Freemail/src/freemail/OutboundContact.java 2008-05-20
21:10:04 UTC (rev 19979)
@@ -697,6 +697,12 @@
continue;
}
+ if(msgs[i].slot==null) {
+ Logger.normal(this,"Index file does not contain
slot name for this message, the mail cannot be sent this way.");
+ Logger.debug(this,"Filename is
"+contactfile.getFile().getPath());
+ continue;
+ }
+
key += msgs[i].slot;
FileInputStream fis;
@@ -733,6 +739,11 @@
}
} else {
Logger.normal(this,"Failed to insert "+key+"
(error code "+err.errorcode+") will try again soon.");
+
if(err.errorcode==FCPInsertErrorMessage.COLLISION) {
+ Logger.error(this,"Failed to insert
"+key+" will try again soon. (Collision, this shouldn't happen)");
+ } else {
+ Logger.normal(this,"Failed to insert
"+key+" will try again soon. Error: "+err.errorcode);
+ }
}
}
}
