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 hb...@apache.org on 2003/01/18 23:03:00 UTC
cvs commit: jakarta-james/src/java/org/apache/james/nntpserver/repository ArticleIDRepository.java NNTPArticleImpl.java NNTPGroupImpl.java NNTPSpooler.java
hbedi 2003/01/18 14:02:59
Modified: src/java/org/apache/james/nntpserver/repository
ArticleIDRepository.java NNTPArticleImpl.java
NNTPGroupImpl.java NNTPSpooler.java
Log:
Using cleaner excalibur IOUtil API.
Revision Changes Path
1.13 +3 -6 jakarta-james/src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java
Index: ArticleIDRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ArticleIDRepository.java 14 Jan 2003 13:41:50 -0000 1.12
+++ ArticleIDRepository.java 18 Jan 2003 22:02:59 -0000 1.13
@@ -7,6 +7,7 @@
*/
package org.apache.james.nntpserver.repository;
+import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.james.util.Base64;
import java.io.File;
@@ -86,9 +87,7 @@
fout = new FileOutputStream(getFileFromID(articleID));
prop.store(fout,new Date().toString());
} finally {
- if (fout != null) {
- fout.close();
- }
+ IOUtil.shutdownStream(fout);
}
}
@@ -142,9 +141,7 @@
fin = new FileInputStream(f);
prop.load(fin);
} finally {
- if (fin != null) {
- fin.close();
- }
+ IOUtil.shutdownStream(fin);
}
Enumeration enum = prop.keys();
NNTPArticle article = null;
1.15 +8 -3 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticleImpl.java
Index: NNTPArticleImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticleImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NNTPArticleImpl.java 18 Jan 2003 19:01:45 -0000 1.14
+++ NNTPArticleImpl.java 18 Jan 2003 22:02:59 -0000 1.15
@@ -7,6 +7,7 @@
*/
package org.apache.james.nntpserver.repository;
+import org.apache.avalon.excalibur.io.IOUtil;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -63,13 +64,17 @@
* @see org.apache.james.nntpsever.repository.NNTPArticle#getUniqueID()
*/
public String getUniqueID() {
+ FileInputStream fin = null;
try {
- FileInputStream fin = new FileInputStream(articleFile);
+ fin = new FileInputStream(articleFile);
InternetHeaders headers = new InternetHeaders(fin);
String[] idheader = headers.getHeader("Message-Id");
- fin.close();
return ( idheader.length > 0 ) ? idheader[0] : null;
- } catch(Exception ex) { throw new NNTPException(ex); }
+ } catch(Exception ex) {
+ throw new NNTPException(ex);
+ } finally {
+ IOUtil.shutdownStream(fin);
+ }
}
/**
1.12 +1 -32 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPGroupImpl.java
Index: NNTPGroupImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPGroupImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NNTPGroupImpl.java 18 Jan 2003 19:01:45 -0000 1.11
+++ NNTPGroupImpl.java 18 Jan 2003 22:02:59 -0000 1.12
@@ -229,39 +229,8 @@
IOUtil.copy(newsStream,fout);
fout.flush();
} finally {
- try {
- if (fout != null) {
- fout.close();
- }
- } catch (IOException ioe) {
- // Ignore this exception so we don't
- // trash any "real" exceptions
- }
+ IOUtil.shutdownStream(fout);
}
return new NNTPArticleImpl(this, articleFile);
}
-
-// public NNTPArticle getArticleFromID(String id) {
-// if ( id == null )
-// return null;
-// int idx = id.indexOf('@');
-// if ( idx != -1 )
-// id = id.substring(0,idx);
-// File f = new File(root,id + ".id");
-// if ( f.exists() == false )
-// return null;
-// try {
-// FileInputStream fin = new FileInputStream(f);
-// int count = fin.available();
-// byte[] ba = new byte[count];
-// fin.read(ba);
-// fin.close();
-// String str = new String(ba);
-// int num = Integer.parseInt(str);
-// return getArticle(num);
-// } catch(IOException ioe) {
-// throw new NNTPException("could not fectch article: "+id,ioe);
-// }
-// }
-
}
1.15 +4 -9 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
Index: NNTPSpooler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NNTPSpooler.java 18 Jan 2003 19:01:45 -0000 1.14
+++ NNTPSpooler.java 18 Jan 2003 22:02:59 -0000 1.15
@@ -7,6 +7,7 @@
*/
package org.apache.james.nntpserver.repository;
+import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -255,9 +256,7 @@
try {
msg = new MimeMessage(null,fin);
} finally {
- try {
- fin.close();
- } catch (IOException _) { /* ignore close error */ }
+ IOUtil.shutdownStream(fin);
}
// ensure no duplicates exist.
@@ -276,9 +275,7 @@
try {
msg.writeTo(fout);
} finally {
- try {
- fout.close();
- } catch (IOException _) { /* ignore close error */ }
+ IOUtil.shutdownStream(fout);
}
}
}
@@ -299,9 +296,7 @@
NNTPArticle article = group.addArticle(newsStream);
prop.setProperty(group.getName(),article.getArticleNumber() + "");
} finally {
- try {
- newsStream.close();
- } catch (IOException _) { /* ignore close error */ }
+ IOUtil.shutdownStream(newsStream);
}
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>