You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by pg...@apache.org on 2002/08/08 01:32:14 UTC
cvs commit: jakarta-james/src/java/org/apache/james/mailrepository MimeMessageAvalonSource.java AvalonSpoolRepository.java AvalonMailRepository.java
pgoldstein 2002/08/07 16:32:14
Modified: src/java/org/apache/james/mailrepository
MimeMessageAvalonSource.java
AvalonSpoolRepository.java
AvalonMailRepository.java
Log:
Part of the String=>StringBuffer changes. Includes some additional
commenting, formatting fixes, and wrapping of logging calls in log
level checks. Also converted equalsIgnoreCase paradigm as discussed on
mailing list. Locale issue for both toUpperCase() and toLowerCase() was
addressed as well.
Revision Changes Path
1.4 +6 -1 jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
Index: MimeMessageAvalonSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MimeMessageAvalonSource.java 18 Apr 2002 14:49:15 -0000 1.3
+++ MimeMessageAvalonSource.java 7 Aug 2002 23:32:14 -0000 1.4
@@ -27,7 +27,12 @@
}
public String getSourceId() {
- return repositoryName + "/" + key;
+ StringBuffer sourceIdBuffer =
+ new StringBuffer(128)
+ .append(repositoryName)
+ .append("/")
+ .append(key);
+ return sourceIdBuffer.toString();
}
public InputStream getInputStream() throws IOException {
1.6 +21 -15 jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java
Index: AvalonSpoolRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AvalonSpoolRepository.java 1 Mar 2002 15:58:39 -0000 1.5
+++ AvalonSpoolRepository.java 7 Aug 2002 23:32:14 -0000 1.6
@@ -32,22 +32,25 @@
implements SpoolRepository {
public synchronized String accept() {
- if (DEEP_DEBUG) {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
getLogger().debug("Method accept() called");
}
while (true) {
try {
for(Iterator it = list(); it.hasNext(); ) {
- String s = it.next().toString();
- if (DEEP_DEBUG) {
- getLogger().debug("Found item " + s
- + " in spool.");
+ String s = it.next().toString();
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ StringBuffer logBuffer =
+ new StringBuffer(64)
+ .append("Found item ")
+ .append(s)
+ .append(" in spool.");
+ getLogger().debug(logBuffer.toString());
}
if (lock(s)) {
- if (DEEP_DEBUG) {
- getLogger().debug("accept() has locked: "
- + s);
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ getLogger().debug("accept() has locked: " + s);
}
return s;
}
@@ -62,21 +65,24 @@
}
public synchronized String accept(long delay) {
- if (DEEP_DEBUG) {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
getLogger().debug("Method accept(delay) called");
}
while (true) {
long youngest = 0;
for (Iterator it = list(); it.hasNext(); ) {
String s = it.next().toString();
- if (DEEP_DEBUG) {
- getLogger().debug("Found item " + s
- + " in spool.");
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ StringBuffer logBuffer =
+ new StringBuffer(64)
+ .append("Found item ")
+ .append(s)
+ .append(" in spool.");
+ getLogger().debug(logBuffer.toString());
}
if (lock(s)) {
- if (DEEP_DEBUG) {
- getLogger().debug("accept(delay) has"
- + " locked: " + s);
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ getLogger().debug("accept(delay) has locked: " + s);
}
//We have a lock on this object... let's grab the message
// and see if it's a valid time.
1.16 +57 -16 jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
Index: AvalonMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AvalonMailRepository.java 18 Apr 2002 14:52:07 -0000 1.15
+++ AvalonMailRepository.java 7 Aug 2002 23:32:14 -0000 1.16
@@ -58,12 +58,17 @@
public void configure(Configuration conf) throws ConfigurationException {
destination = conf.getAttribute("destinationURL");
- getLogger().debug("AvalonMailRepository.destinationURL: " + destination);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("AvalonMailRepository.destinationURL: " + destination);
+ }
String checkType = conf.getAttribute("type");
if (! (checkType.equals("MAIL") || checkType.equals("SPOOL")) ) {
- getLogger().warn( "Attempt to configure AvalonMailRepository as " +
- checkType);
- throw new ConfigurationException("Attempt to configure AvalonMailRepository as " + checkType);
+ String exceptionString = "Attempt to configure AvalonMailRepository as " +
+ checkType;
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn(exceptionString);
+ }
+ throw new ConfigurationException(exceptionString);
}
// ignore model
}
@@ -130,8 +135,14 @@
for (Iterator i = or.list(); i.hasNext(); ) {
keys.add(i.next());
}
-
- getLogger().debug(this.getClass().getName() + " created in " + destination);
+ if (getLogger().isDebugEnabled()) {
+ StringBuffer logBuffer =
+ new StringBuffer(128)
+ .append(this.getClass().getName())
+ .append(" created in ")
+ .append(destination);
+ getLogger().debug(logBuffer.toString());
+ }
} catch (Exception e) {
final String message = "Failed to retrieve Store component:" + e.getMessage();
getLogger().error( message, e );
@@ -181,10 +192,21 @@
MimeMessageWrapper wrapper = (MimeMessageWrapper) mc.getMessage();
if (DEEP_DEBUG) {
System.out.println("Retrieving from: " + wrapper.getSourceId());
- System.out.println("Saving to: " + destination + "/" + mc.getName());
+ StringBuffer debugBuffer =
+ new StringBuffer(64)
+ .append("Saving to: ")
+ .append(destination)
+ .append("/")
+ .append(mc.getName());
+ System.out.println(debugBuffer.toString());
System.out.println("Modified: " + wrapper.isModified());
}
- if (wrapper.getSourceId().equals(destination + "/" + mc.getName()) && !wrapper.isModified()) {
+ StringBuffer destinationBuffer =
+ new StringBuffer(128)
+ .append(destination)
+ .append("/")
+ .append(mc.getName());
+ if (wrapper.getSourceId().equals(destinationBuffer.toString()) && !wrapper.isModified()) {
//We're trying to save to the same place, and it's not modified... we shouldn't save.
//More importantly, if we try to save, we will create a 0-byte file since we're
//retrying to retrieve from a file we'll be overwriting.
@@ -192,9 +214,13 @@
}
}
if (saveStream) {
- OutputStream out = sr.put(key);
- mc.writeMessageTo(out);
- out.close();
+ OutputStream out = null;
+ try {
+ out = sr.put(key);
+ mc.writeMessageTo(out);
+ } finally {
+ out.close();
+ }
}
//Always save the header information
or.put(key, mc);
@@ -205,8 +231,13 @@
}
}
- if (DEEP_DEBUG) {
- getLogger().debug("Mail " + key + " stored." );
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ StringBuffer logBuffer =
+ new StringBuffer(64)
+ .append("Mail ")
+ .append(key)
+ .append(" stored.");
+ getLogger().debug(logBuffer.toString());
}
synchronized (this) {
@@ -220,7 +251,7 @@
}
public MailImpl retrieve(String key) {
- if (DEEP_DEBUG) {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
getLogger().debug("Retrieving mail: " + key);
}
try {
@@ -228,7 +259,12 @@
try {
mc = (MailImpl) or.get(key);
} catch (RuntimeException re) {
- getLogger().error("Exception retrieving mail: " + re + ", so we're deleting it... good ridance!");
+ StringBuffer exceptionBuffer =
+ new StringBuffer(128)
+ .append("Exception retrieving mail: ")
+ .append(re.toString())
+ .append(", so we're deleting it... good riddance!");
+ getLogger().error(exceptionBuffer.toString());
remove(key);
return null;
}
@@ -256,7 +292,12 @@
unlock(key);
}
} else {
- throw new RuntimeException("Cannot lock " + key + " to remove it");
+ StringBuffer exceptionBuffer =
+ new StringBuffer(64)
+ .append("Cannot lock ")
+ .append(key)
+ .append(" to remove it");
+ throw new RuntimeException(exceptionBuffer.toString());
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>