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 no...@apache.org on 2003/10/20 08:03:16 UTC
cvs commit: james-server/src/java/org/apache/james/util/mordred JdbcDataSource.java
noel 2003/10/19 23:03:16
Modified: src/java/org/apache/james Tag: branch_2_1_fcs James.java
src/java/org/apache/james/core Tag: branch_2_1_fcs
AvalonMailStore.java MimeMessageWrapper.java
src/java/org/apache/james/mailrepository Tag: branch_2_1_fcs
AvalonMailRepository.java JDBCMailRepository.java
MBoxMailRepository.java
src/java/org/apache/james/mailrepository/filepair Tag:
branch_2_1_fcs AbstractFileRepository.java
src/java/org/apache/james/nntpserver/repository Tag:
branch_2_1_fcs NNTPRepositoryImpl.java
src/java/org/apache/james/transport Tag: branch_2_1_fcs
JamesSpoolManager.java
src/java/org/apache/james/transport/mailets Tag:
branch_2_1_fcs CommandListservProcessor.java
src/java/org/apache/james/transport/mailets/listservcommands
Tag: branch_2_1_fcs MailDataSource.java
src/java/org/apache/james/userrepository Tag: branch_2_1_fcs
AbstractJdbcUsersRepository.java
UsersLDAPRepository.java
src/java/org/apache/james/util/mordred Tag: branch_2_1_fcs
JdbcDataSource.java
Log:
Removed printStackTrace() calls
Revision Changes Path
No revision
No revision
1.35.4.11 +1 -2 james-server/src/java/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/James.java,v
retrieving revision 1.35.4.10
retrieving revision 1.35.4.11
diff -u -r1.35.4.10 -r1.35.4.11
--- James.java 2 Jul 2003 11:16:42 -0000 1.35.4.10
+++ James.java 20 Oct 2003 06:03:15 -0000 1.35.4.11
@@ -555,7 +555,6 @@
userInbox = (MailRepository) mailstore.select(mboxConf);
mailboxes.put(userName, userInbox);
} catch (Exception e) {
- e.printStackTrace();
if (getLogger().isErrorEnabled())
{
getLogger().error("Cannot open user Mailbox" + e);
No revision
No revision
1.17.4.3 +0 -1 james-server/src/java/org/apache/james/core/AvalonMailStore.java
Index: AvalonMailStore.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/core/AvalonMailStore.java,v
retrieving revision 1.17.4.2
retrieving revision 1.17.4.3
diff -u -r1.17.4.2 -r1.17.4.3
--- AvalonMailStore.java 8 Mar 2003 21:54:02 -0000 1.17.4.2
+++ AvalonMailStore.java 20 Oct 2003 06:03:15 -0000 1.17.4.3
@@ -365,7 +365,6 @@
getLogger().warn( "Exception while creating repository:" +
e.getMessage(), e );
}
- e.printStackTrace();
throw new
ComponentException("Cannot find or init repository",
e);
1.17.4.9 +0 -3 james-server/src/java/org/apache/james/core/MimeMessageWrapper.java
Index: MimeMessageWrapper.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/core/MimeMessageWrapper.java,v
retrieving revision 1.17.4.8
retrieving revision 1.17.4.9
diff -u -r1.17.4.8 -r1.17.4.9
--- MimeMessageWrapper.java 11 Mar 2003 07:19:55 -0000 1.17.4.8
+++ MimeMessageWrapper.java 20 Oct 2003 06:03:15 -0000 1.17.4.9
@@ -170,7 +170,6 @@
IOUtil.shutdownStream(in);
}
} catch (IOException ioe) {
- ioe.printStackTrace();
throw new MessagingException("Unable to parse headers from stream: " + ioe.getMessage(), ioe);
}
}
@@ -197,7 +196,6 @@
message = new MimeMessage(session, in);
} catch (IOException ioe) {
- ioe.printStackTrace();
throw new MessagingException("Unable to parse stream: " + ioe.getMessage(), ioe);
} finally {
IOUtil.shutdownStream(in);
@@ -577,7 +575,6 @@
}
return counter.getLineNumber();
} catch (IOException ioe) {
- ioe.printStackTrace();
return -1;
} finally {
IOUtil.shutdownStream(in);
No revision
No revision
1.20.4.12 +0 -1 james-server/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
Index: AvalonMailRepository.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/mailrepository/AvalonMailRepository.java,v
retrieving revision 1.20.4.11
retrieving revision 1.20.4.12
diff -u -r1.20.4.11 -r1.20.4.12
--- AvalonMailRepository.java 20 Oct 2003 00:24:32 -0000 1.20.4.11
+++ AvalonMailRepository.java 20 Oct 2003 06:03:15 -0000 1.20.4.12
@@ -352,7 +352,6 @@
}
} catch (Exception e) {
getLogger().error("Exception storing mail: " + e);
- e.printStackTrace();
throw new MessagingException("Exception caught while storing Message Container: " + e);
}
}
1.30.4.12 +15 -21 james-server/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
Index: JDBCMailRepository.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/mailrepository/JDBCMailRepository.java,v
retrieving revision 1.30.4.11
retrieving revision 1.30.4.12
diff -u -r1.30.4.11 -r1.30.4.12
--- JDBCMailRepository.java 8 Sep 2003 16:39:42 -0000 1.30.4.11
+++ JDBCMailRepository.java 20 Oct 2003 06:03:15 -0000 1.30.4.12
@@ -330,7 +330,6 @@
} catch (Exception e) {
final String message = "Failed to retrieve Store component:" + e.getMessage();
getLogger().error(message, e);
- e.printStackTrace();
throw new ConfigurationException(message, e);
}
}
@@ -803,7 +802,6 @@
notify();
}
} catch (Exception e) {
- e.printStackTrace();
throw new MessagingException("Exception caught while storing mail Container: " + e);
} finally {
theJDBCUtil.closeJDBCConnection(conn);
@@ -898,14 +896,13 @@
}
}
} catch (SQLException sqle) {
- synchronized (System.err) {
- System.err.println("Error retrieving message");
- System.err.println(sqle.getMessage());
- System.err.println(sqle.getErrorCode());
- System.err.println(sqle.getSQLState());
- System.err.println(sqle.getNextException());
- sqle.printStackTrace();
- }
+ StringBuffer errorBuffer = new StringBuffer(256)
+ .append("Error retrieving message")
+ .append(sqle.getMessage())
+ .append(sqle.getErrorCode())
+ .append(sqle.getSQLState())
+ .append(sqle.getNextException());
+ getLogger().error(errorBuffer.toString());
} finally {
theJDBCUtil.closeJDBCResultSet(rsMessageAttr);
theJDBCUtil.closeJDBCStatement(retrieveMessageAttr);
@@ -938,17 +935,15 @@
mc.setMessage(message);
return mc;
} catch (SQLException sqle) {
- synchronized (System.err) {
- System.err.println("Error retrieving message");
- System.err.println(sqle.getMessage());
- System.err.println(sqle.getErrorCode());
- System.err.println(sqle.getSQLState());
- System.err.println(sqle.getNextException());
- sqle.printStackTrace();
- }
+ StringBuffer errorBuffer = new StringBuffer(256)
+ .append("Error retrieving message")
+ .append(sqle.getMessage())
+ .append(sqle.getErrorCode())
+ .append(sqle.getSQLState())
+ .append(sqle.getNextException());
+ getLogger().error(errorBuffer.toString());
throw new MessagingException("Exception while retrieving mail: " + sqle.getMessage());
} catch (Exception me) {
- me.printStackTrace();
throw new MessagingException("Exception while retrieving mail: " + me.getMessage());
} finally {
theJDBCUtil.closeJDBCResultSet(rsMessage);
@@ -1033,7 +1028,6 @@
}
return messageList.iterator();
} catch (Exception me) {
- me.printStackTrace();
throw new MessagingException("Exception while listing mail: " + me.getMessage());
} finally {
theJDBCUtil.closeJDBCResultSet(rsListMessages);
1.1.2.2 +1 -3 james-server/src/java/org/apache/james/mailrepository/Attic/MBoxMailRepository.java
Index: MBoxMailRepository.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/mailrepository/Attic/MBoxMailRepository.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MBoxMailRepository.java 28 Aug 2003 16:33:26 -0000 1.1.2.1
+++ MBoxMailRepository.java 20 Oct 2003 06:03:15 -0000 1.1.2.2
@@ -716,10 +716,8 @@
} catch (FileNotFoundException e) {
- e.printStackTrace();
getLogger().error("Unable to save(open) file (File not found) " + mboxFile, e);
} catch (IOException e) {
- e.printStackTrace();
getLogger().error("Unable to write file (General I/O problem) " + mboxFile, e);
}
No revision
No revision
1.2.2.3 +0 -1 james-server/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
Index: AbstractFileRepository.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- AbstractFileRepository.java 8 Mar 2003 21:54:04 -0000 1.2.2.2
+++ AbstractFileRepository.java 20 Oct 2003 06:03:15 -0000 1.2.2.3
@@ -186,7 +186,6 @@
}
}
} catch (Exception e) {
- e.printStackTrace();
throw e;
}
No revision
No revision
1.11.4.5 +1 -1 james-server/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
Index: NNTPRepositoryImpl.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java,v
retrieving revision 1.11.4.4
retrieving revision 1.11.4.5
diff -u -r1.11.4.4 -r1.11.4.5
--- NNTPRepositoryImpl.java 15 Jun 2003 18:05:22 -0000 1.11.4.4
+++ NNTPRepositoryImpl.java 20 Oct 2003 06:03:15 -0000 1.11.4.5
@@ -349,7 +349,7 @@
try {
return articleIDRepo.getArticle(this,id);
} catch(Exception ex) {
- ex.printStackTrace();
+ getLogger().error("Couldn't get article " + id + ": ", ex);
return null;
}
}
No revision
No revision
1.20.4.9 +5 -7 james-server/src/java/org/apache/james/transport/JamesSpoolManager.java
Index: JamesSpoolManager.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/JamesSpoolManager.java,v
retrieving revision 1.20.4.8
retrieving revision 1.20.4.9
diff -u -r1.20.4.8 -r1.20.4.9
--- JamesSpoolManager.java 19 Jun 2003 16:16:37 -0000 1.20.4.8
+++ JamesSpoolManager.java 20 Oct 2003 06:03:15 -0000 1.20.4.9
@@ -260,7 +260,6 @@
}
System.err.println("Unable to init matcher " + matcherName);
System.err.println("Check spool manager logs for more details.");
- ex.printStackTrace();
//System.exit(1);
throw ex;
}
@@ -288,7 +287,6 @@
}
System.err.println("Unable to init mailet " + mailetClassName);
System.err.println("Check spool manager logs for more details.");
- ex.printStackTrace();
//System.exit(1);
throw ex;
}
@@ -391,13 +389,13 @@
}
mail = null;
} catch (Throwable e) {
- e.printStackTrace();
if (getLogger().isErrorEnabled()) {
- getLogger().error("Exception in JamesSpoolManager.run "
+ getLogger().error("Exception processing " + key + " in JamesSpoolManager.run "
+ e.getMessage(), e);
- }
+ }
}
- }
+ }
+
}
/**
No revision
No revision
1.1.2.4 +2 -7 james-server/src/java/org/apache/james/transport/mailets/Attic/CommandListservProcessor.java
Index: CommandListservProcessor.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/Attic/CommandListservProcessor.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CommandListservProcessor.java 19 Oct 2003 20:22:50 -0000 1.1.2.3
+++ CommandListservProcessor.java 20 Oct 2003 06:03:15 -0000 1.1.2.4
@@ -210,12 +210,7 @@
autoBracket = getBoolean("autobracket", true);
try {
listOwner = new MailAddress(getString("listOwner", null));
- } catch (ParseException e) {
- e.printStackTrace(); //To change body of catch statement use Options | File Templates.
- }
-
- //initialize resources
- try {
+ //initialize resources
initializeResources();
//init user repos
initUsersRepository();
No revision
No revision
1.1.2.3 +8 -15 james-server/src/java/org/apache/james/transport/mailets/listservcommands/Attic/MailDataSource.java
Index: MailDataSource.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/transport/mailets/listservcommands/Attic/MailDataSource.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MailDataSource.java 6 Jul 2003 11:53:56 -0000 1.1.2.2
+++ MailDataSource.java 20 Oct 2003 06:03:16 -0000 1.1.2.3
@@ -83,15 +83,12 @@
/**
* Create a datasource from an input stream
*/
- public MailDataSource(InputStream inputStream, String contentType) {
+ public MailDataSource(InputStream inputStream, String contentType) throws IOException {
this.contentType = contentType;
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- copyStream(inputStream, baos);
- data = baos.toByteArray();
- } catch (IOException e) {
- e.printStackTrace();
- }
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ copyStream(inputStream, baos);
+ data = baos.toByteArray();
}
/**
@@ -105,13 +102,9 @@
/**
* Create a datasource from a String
*/
- public MailDataSource(String data, String contentType) {
+ public MailDataSource(String data, String contentType) throws UnsupportedEncodingException {
this.contentType = contentType;
- try {
- this.data = data.getBytes(DEFAULT_ENCODING);
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
+ this.data = data.getBytes(DEFAULT_ENCODING);
}
/**
No revision
No revision
1.14.4.4 +0 -5 james-server/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
Index: AbstractJdbcUsersRepository.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
retrieving revision 1.14.4.3
retrieving revision 1.14.4.4
diff -u -r1.14.4.3 -r1.14.4.4
--- AbstractJdbcUsersRepository.java 29 May 2003 20:22:46 -0000 1.14.4.3
+++ AbstractJdbcUsersRepository.java 20 Oct 2003 06:03:16 -0000 1.14.4.4
@@ -434,7 +434,6 @@
}
}
catch ( SQLException sqlExc) {
- sqlExc.printStackTrace();
throw new CascadingRuntimeException("Error accessing database", sqlExc);
}
finally {
@@ -467,7 +466,6 @@
addUserStatement.execute();
}
catch ( SQLException sqlExc) {
- sqlExc.printStackTrace();
throw new CascadingRuntimeException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCStatement(addUserStatement);
@@ -495,7 +493,6 @@
removeUserStatement.execute();
}
catch ( SQLException sqlExc ) {
- sqlExc.printStackTrace();
throw new CascadingRuntimeException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCStatement(removeUserStatement);
@@ -520,7 +517,6 @@
updateUserStatement.execute();
}
catch ( SQLException sqlExc ) {
- sqlExc.printStackTrace();
throw new CascadingRuntimeException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCStatement(updateUserStatement);
@@ -576,7 +572,6 @@
return user;
}
catch ( SQLException sqlExc ) {
- sqlExc.printStackTrace();
throw new CascadingRuntimeException("Error accessing database", sqlExc);
}
finally {
1.9.4.4 +3 -6 james-server/src/java/org/apache/james/userrepository/UsersLDAPRepository.java
Index: UsersLDAPRepository.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.9.4.3
retrieving revision 1.9.4.4
diff -u -r1.9.4.3 -r1.9.4.4
--- UsersLDAPRepository.java 2 Aug 2003 19:21:23 -0000 1.9.4.3
+++ UsersLDAPRepository.java 20 Oct 2003 06:03:16 -0000 1.9.4.4
@@ -196,11 +196,9 @@
try {
ctx = new InitialDirContext(env); // Could throw a NamingExcpetion
} catch (Exception e) {
- e.getMessage();
- e.printStackTrace();
+ getLogger().error("Exception creating InitialDirContext: ", e);
}
-
getLogger().info("Initial context initialized from " + baseURL);
}
@@ -255,8 +253,7 @@
getLogger().info("Created new LDAP node: " + destination);
}
} catch (NamingException e) {
- System.out.println("Problem with child nodes " + e.getMessage());
- e.printStackTrace();
+ getLogger().error("Problem with child nodes " + e.getMessage(), e);
}
return destination;
No revision
No revision
1.18.4.4 +1 -2 james-server/src/java/org/apache/james/util/mordred/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/mordred/JdbcDataSource.java,v
retrieving revision 1.18.4.3
retrieving revision 1.18.4.4
diff -u -r1.18.4.3 -r1.18.4.4
--- JdbcDataSource.java 7 May 2003 03:01:59 -0000 1.18.4.3
+++ JdbcDataSource.java 20 Oct 2003 06:03:16 -0000 1.18.4.4
@@ -401,7 +401,6 @@
if (getLogger().isWarnEnabled()) {
getLogger().warn("----> Could not find connection to kill!!!");
}
- new Throwable().printStackTrace();
return;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org