Author: felixk
Date: Thu Mar 24 21:47:48 2011
New Revision: 1085155
URL: http://svn.apache.org/viewvc?rev=1085155&view=rev
Log:
I don't see the benefit of a nested try block
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java?rev=1085155&r1=1085154&r2=1085155&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
Thu Mar 24 21:47:48 2011
@@ -84,49 +84,44 @@ public class NetworkIsInWhitelist extend
PreparedStatement selectStmt = null;
ResultSet selectRS = null;
try {
+ String recipientUser =
recipientMailAddress.getLocalPart().toLowerCase(Locale.US);
+ String recipientHost =
recipientMailAddress.getDomain().toLowerCase(Locale.US);
- try {
- String recipientUser =
recipientMailAddress.getLocalPart().toLowerCase(Locale.US);
- String recipientHost =
recipientMailAddress.getDomain().toLowerCase(Locale.US);
+ if (conn == null) {
+ conn = datasource.getConnection();
+ }
- if (conn == null) {
- conn = datasource.getConnection();
- }
+ if (selectStmt == null) {
+ selectStmt = conn.prepareStatement(selectNetworks);
+ }
+ selectStmt.setString(1, recipientUser);
+ selectStmt.setString(2, recipientHost);
+ selectRS = selectStmt.executeQuery();
+ List<String> nets = new ArrayList<String>();
+ while (selectRS.next()) {
+ nets.add(selectRS.getString(1));
+ }
+ NetMatcher matcher = new NetMatcher(nets, dns);
+ boolean matched = matcher.matchInetNetwork(mail.getRemoteAddr());
- if (selectStmt == null) {
- selectStmt = conn.prepareStatement(selectNetworks);
- }
- selectStmt.setString(1, recipientUser);
+ if (matched == false) {
+ selectStmt = conn.prepareStatement(selectNetworks);
+ selectStmt.setString(1, "*");
selectStmt.setString(2, recipientHost);
selectRS = selectStmt.executeQuery();
- List<String> nets = new ArrayList<String>();
+ nets = new ArrayList<String>();
while (selectRS.next()) {
nets.add(selectRS.getString(1));
}
- NetMatcher matcher = new NetMatcher(nets, dns);
- boolean matched =
matcher.matchInetNetwork(mail.getRemoteAddr());
-
- if (matched == false) {
- selectStmt = conn.prepareStatement(selectNetworks);
- selectStmt.setString(1, "*");
- selectStmt.setString(2, recipientHost);
- selectRS = selectStmt.executeQuery();
- nets = new ArrayList<String>();
- while (selectRS.next()) {
- nets.add(selectRS.getString(1));
- }
- matcher = new NetMatcher(nets, dns);
- matched = matcher.matchInetNetwork(mail.getRemoteAddr());
- }
- return matched;
- } finally {
- theJDBCUtil.closeJDBCResultSet(selectRS);
+ matcher = new NetMatcher(nets, dns);
+ matched = matcher.matchInetNetwork(mail.getRemoteAddr());
}
-
+ return matched;
} catch (SQLException sqle) {
log("Error accessing database", sqle);
throw new MessagingException("Exception thrown", sqle);
} finally {
+ theJDBCUtil.closeJDBCResultSet(selectRS);
theJDBCUtil.closeJDBCStatement(selectStmt);
theJDBCUtil.closeJDBCConnection(conn);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
