Author: noel
Date: Thu Aug 3 12:09:21 2006
New Revision: 428480
URL: http://svn.apache.org/viewvc?rev=428480&view=rev
Log:
1) Revert RemoteManagerHandler.java to RC1 state. This should be identical to
r382444 for this file. It removes the temporary debugging commands
SHOWTRACKERS and GC.
2) Remove the use of FileCleaner from, and restore the use of
SharedFileInputStream to, MimeMessageInputStreamSource, but keep the recent
improvements in exception handling, and keep finalize() commented out.
3) Remove FileCleaner.java entirely.
Removed:
james/server/branches/v2.3/src/java/org/apache/james/util/io/FileCleaner.java
Modified:
james/server/branches/v2.3/src/java/org/apache/james/core/MimeMessageInputStreamSource.java
james/server/branches/v2.3/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
Modified:
james/server/branches/v2.3/src/java/org/apache/james/core/MimeMessageInputStreamSource.java
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/java/org/apache/james/core/MimeMessageInputStreamSource.java?rev=428480&r1=428479&r2=428480&view=diff
==============================================================================
---
james/server/branches/v2.3/src/java/org/apache/james/core/MimeMessageInputStreamSource.java
(original)
+++
james/server/branches/v2.3/src/java/org/apache/james/core/MimeMessageInputStreamSource.java
Thu Aug 3 12:09:21 2006
@@ -71,7 +71,6 @@
OutputStream fout = null;
try {
file = File.createTempFile(key, ".m64");
- org.apache.james.util.io.FileCleaner.track(file, this);
fout = new BufferedOutputStream(new FileOutputStream(file));
int b = -1;
while ((b = in.read()) != -1) {
@@ -132,7 +131,7 @@
* @return a <code>BufferedInputStream</code> containing the data
*/
public synchronized InputStream getInputStream() throws IOException {
- return new java.io.BufferedInputStream(new
java.io.FileInputStream(file));
+ return new SharedFileInputStream(file);
}
/**
Modified:
james/server/branches/v2.3/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
URL:
http://svn.apache.org/viewvc/james/server/branches/v2.3/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java?rev=428480&r1=428479&r2=428480&view=diff
==============================================================================
---
james/server/branches/v2.3/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
(original)
+++
james/server/branches/v2.3/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
Thu Aug 3 12:09:21 2006
@@ -391,12 +391,6 @@
command = command.toUpperCase(Locale.US);
if (command.equals(COMMAND_ADDUSER)) {
doADDUSER(argument);
- } else if (command.equals("SHOWTRACKERS")) {
- org.apache.james.util.io.FileCleaner.dump(out);
- return true;
- } else if (command.equals("GC")) {
- System.gc();
- return true;
} else if (command.equals(COMMAND_SETPASSWORD)) {
return doSETPASSWORD(argument);
} else if (command.equals(COMMAND_DELUSER)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
