[Carbon-commits] [Carbon Platform] svn commit r46734 - in branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core: def hybrid
dimuthul at wso2.com
dimuthul at wso2.com
Wed Oct 7 21:48:08 PDT 2009
Author: dimuthul
Date: Wed Oct 7 21:48:08 2009
New Revision: 46734
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=46734
Log:
Centralizing the database connection close code.
Modified:
branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAccessControlAdmin.java
branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAuthenticator.java
branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreAdmin.java
branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreReader.java
branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/hybrid/HybridInternalRoleAdmin.java
Modified: branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAccessControlAdmin.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAccessControlAdmin.java?rev=46734&r1=46733&r2=46734&view=diff
==============================================================================
--- branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAccessControlAdmin.java (original)
+++ branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAccessControlAdmin.java Wed Oct 7 21:48:08 2009
@@ -168,10 +168,7 @@
if (rs1.next()) {
permissionId = rs1.getInt(DefaultRealmConstants.COLUMN_NAME_ID);
}
- if (prepStmt1 != null) {
- prepStmt1.close();
- }
-
+
prepStmt2 = dbConnection.prepareStatement(sqlHelper
.getSQL(DefaultRealmConstants.ADD_PERMISSION));
Modified: branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAuthenticator.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAuthenticator.java?rev=46734&r1=46733&r2=46734&view=diff
==============================================================================
--- branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAuthenticator.java (original)
+++ branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultAuthenticator.java Wed Oct 7 21:48:08 2009
@@ -32,6 +32,7 @@
import org.wso2.carbon.user.core.UserStoreException;
import org.wso2.carbon.user.core.def.util.DefaultSQLHelperImpl;
import org.wso2.carbon.user.core.i18n.Messages;
+import org.wso2.carbon.user.core.util.DatabaseUtil;
/**
* @see org.wso2.usermanager.Authenticator
@@ -103,26 +104,17 @@
isAuth = finalValue.equals(dbCred);
}
} catch (SQLException e) {
- log.debug(e);
+ log.error(e);
throw new AuthenticatorException(Messages.getMessage("errorReadingFromUserStore"), e);
} catch (NoSuchAlgorithmException e) {
- log.debug(e);
+ log.error(e);
throw new AuthenticatorException(Messages.getMessage("errorCreatingPasswordDigest"), e);
} finally {
try {
- if (rs != null) {
- rs.close();
- }
-
- if (prepStmt != null) {
- prepStmt.close();
- }
-
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new AuthenticatorException(Messages.getMessage("errorClosingConnection"), e);
+ DatabaseUtil.closeAllConnections(dbConnection, rs, prepStmt);
+ } catch (UserStoreException e) {
+ log.error(e);
+ throw new AuthenticatorException(e.getMessage(), e);
}
}
return isAuth;
Modified: branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreAdmin.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreAdmin.java?rev=46734&r1=46733&r2=46734&view=diff
==============================================================================
--- branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreAdmin.java (original)
+++ branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreAdmin.java Wed Oct 7 21:48:08 2009
@@ -15,6 +15,7 @@
*/
package org.wso2.carbon.user.core.def;
+import java.awt.image.DataBufferUShort;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.sql.Connection;
@@ -335,19 +336,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (deleteRolePropsStmt != null) {
- deleteRolePropsStmt.close();
- }
- if (setRolePropertiesStmt != null) {
- setRolePropertiesStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, deleteRolePropsStmt, setRolePropertiesStmt);
}
}
@@ -371,21 +360,11 @@
addRoleStmt.setString(1, roleName);
addRoleStmt.execute();
dbConnection.commit();
- addRoleStmt.close();
} catch (SQLException e) {
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (addRoleStmt != null) {
- addRoleStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, addRoleStmt);
}
}
@@ -409,18 +388,15 @@
prepStmt1 = dbConnection.prepareStatement(sql);
prepStmt1.setInt(1, id);
prepStmt1.executeUpdate();
- prepStmt1.close();
}
prepStmt2 = dbConnection.prepareStatement(sqlHelper
.getSQL(DefaultRealmConstants.ON_DELETE_ROLE_UM_ROLE_PERMISSIONS));
prepStmt2.setInt(1, id);
prepStmt2.executeUpdate();
- prepStmt2.close();
prepStmt3 = dbConnection.prepareStatement(sqlHelper
.getSQL(DefaultRealmConstants.ON_DELETE_ROLE_UM_USER_ROLES));
prepStmt3.setInt(1, id);
prepStmt3.executeUpdate();
- prepStmt3.close();
prepStmt4 = dbConnection.prepareStatement(sqlHelper
.getSQL(DefaultRealmConstants.DELETE_ROLE));
prepStmt4.setString(1, roleName);
@@ -430,7 +406,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- this.closeAllConnections(dbConnection, prepStmt1, prepStmt2, prepStmt3, prepStmt4);
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt1, prepStmt2, prepStmt3, prepStmt4);
}
}
@@ -454,21 +430,11 @@
addUserToRoleStmt.setInt(2, roleid);
addUserToRoleStmt.executeUpdate();
dbConnection.commit();
- addUserToRoleStmt.close();
} catch (SQLException e) {
log.error(e.getMessage(), e);
throw new UserStoreException(Messages.getMessage("errorAddingUserToRole"), e);
} finally {
- try {
- if (addUserToRoleStmt != null) {
- addUserToRoleStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, addUserToRoleStmt);
}
}
@@ -488,22 +454,12 @@
removeUserFromRoleStmt.setString(2, roleName);
removeUserFromRoleStmt.executeUpdate();
dbConnection.commit();
- removeUserFromRoleStmt.close();
} catch (SQLException e) {
e.printStackTrace();
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (removeUserFromRoleStmt != null) {
- removeUserFromRoleStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, removeUserFromRoleStmt);
}
}
@@ -518,22 +474,12 @@
prepStmt.setString(2, roleName);
prepStmt.executeUpdate();
dbConnection.commit();
- prepStmt.close();
log.info("Changed role name from :: " + roleName + " to " + newRoleName);
} catch (SQLException e) {
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (prepStmt != null) {
- prepStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt);
}
}
@@ -643,16 +589,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (prepStmt != null) {
- prepStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt);
}
}
@@ -728,16 +665,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (prepStmt != null) {
- prepStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt);
}
}
@@ -792,19 +720,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (prepStmt1 != null) {
- prepStmt1.close();
- }
- if (prepStmt2 != null) {
- prepStmt2.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt1, prepStmt2);
}
}
@@ -831,16 +747,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (prepStmt != null) {
- prepStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt);
}
}
@@ -970,24 +877,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (rs != null) {
- rs.close();
- }
-
- if (prepStmt1 != null) {
- prepStmt1.close();
- }
- if (prepStmt2 != null) {
- prepStmt2.close();
- }
-
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, rs, prepStmt1, prepStmt2);
}
}
@@ -1037,21 +927,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
-
- if (prepStmt1 != null) {
- prepStmt1.close();
- }
- if (prepStmt2 != null) {
- prepStmt2.close();
- }
-
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt1, prepStmt2);
}
}
@@ -1114,20 +990,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
-
- if (prepStmt1 != null) {
- prepStmt1.close();
- }
- if (prepStmt2 != null) {
- prepStmt2.close();
- }
- if (prepStmt3 != null) {
- prepStmt3.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(null, prepStmt1, prepStmt2, prepStmt3);
}
}
@@ -1159,14 +1022,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
-
- if (prepStmt != null) {
- prepStmt.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(null, prepStmt);
}
}
@@ -1188,33 +1044,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
-
- if (prepStmt != null) {
- prepStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
- }
- }
-
- private void closeAllConnections(Connection dbConnection, PreparedStatement... prepStmts)
- throws UserStoreException {
- try {
- for (PreparedStatement stmt : prepStmts) {
- if (stmt != null) {
- stmt.close();
- }
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt);
}
}
Modified: branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreReader.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreReader.java?rev=46734&r1=46733&r2=46734&view=diff
==============================================================================
--- branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreReader.java (original)
+++ branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/def/DefaultUserStoreReader.java Wed Oct 7 21:48:08 2009
@@ -368,7 +368,6 @@
lst.add(rs.getString(colName));
}
names = (String[]) lst.toArray(new String[lst.size()]);
- getUserInRole.close();
} catch (SQLException e) {
log.error(e.getMessage(),e);
throw new UserStoreException(e.getMessage(), e);
@@ -421,7 +420,6 @@
}
i++;
}
- rs.close();
if (lst.size() > 0) {
users = (String[]) lst.toArray(new String[lst.size()]);
@@ -431,19 +429,15 @@
log.error(e.getMessage(),e);
throw new UserStoreException(e.getMessage(), e);
} finally {
+ DatabaseUtil.closeAllConnections(null, rs);
try {
- if (rs != null) {
- rs.close();
- }
if (stmt != null) {
stmt.close();
}
- if (dbConnection != null) {
- dbConnection.close();
- }
} catch (SQLException e) {
throw new UserStoreException(e.getMessage(), e);
}
+ DatabaseUtil.closeAllConnections(dbConnection);
}
return users;
}
Modified: branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/hybrid/HybridInternalRoleAdmin.java
URL: http://wso2.org/svn/browse/wso2/branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/hybrid/HybridInternalRoleAdmin.java?rev=46734&r1=46733&r2=46734&view=diff
==============================================================================
--- branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/hybrid/HybridInternalRoleAdmin.java (original)
+++ branches/carbon-platform/2.0.2/carbon/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/hybrid/HybridInternalRoleAdmin.java Wed Oct 7 21:48:08 2009
@@ -20,6 +20,7 @@
import org.wso2.carbon.user.core.def.SQLHelper;
import org.wso2.carbon.user.core.def.util.DefaultCommons;
import org.wso2.carbon.user.core.i18n.Messages;
+import org.wso2.carbon.user.core.util.DatabaseUtil;
public class HybridInternalRoleAdmin{
@@ -74,16 +75,7 @@
e.printStackTrace();
throw new UserStoreException(Messages.getMessage("errorAddingUserToRole"), e);
} finally {
- try {
- if (addUserToRoleStmt!=null) {
- addUserToRoleStmt.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, addUserToRoleStmt);
}
}
@@ -118,22 +110,7 @@
log.error(e.getMessage(), e);
throw new UserStoreException(e.getMessage(), e);
} finally {
- try {
- if (prepStmt2 != null) {
- prepStmt2.close();
- }
- if (prepStmt3 != null) {
- prepStmt3.close();
- }
- if (prepStmt4 != null) {
- prepStmt4.close();
- }
- if (dbConnection != null) {
- dbConnection.close();
- }
- } catch (SQLException e) {
- throw new UserStoreException(Messages.getMessage("errorClosingConnection"), e);
- }
+ DatabaseUtil.closeAllConnections(dbConnection, prepStmt2, prepStmt3, prepStmt4);
}
}
More information about the Carbon-commits
mailing list