Merge pull request #446 from hpmtissera/fix_db_connection_issues

Fix db connection issues
wso2-attic · Jun 17, 2015 · 1faa630 · 1faa630
2 parents a6731ae + d859d78
commit 1faa630
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 51 deletions.
diff --git a/...t/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java b/...t/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java
@@ -2038,6 +2038,7 @@ public ApplicationBasicInfo[] getAllApplicationBasicInfo()
                     }
                 }
             }
+            connection.commit();
         } catch (SQLException | IdentityException e) {
             throw new IdentityApplicationManagementException("Error while Reading all Applications");
         } finally {
@@ -2412,6 +2413,7 @@ public String getServiceProviderNameByClientId(String clientId, String clientTyp
             if (appNameResult.next()) {
                 applicationName = appNameResult.getString(1);
             }
+            connection.commit();
         } catch (SQLException | IdentityException e) {
             throw new IdentityApplicationManagementException("Error while reading application");
         } finally {
@@ -2470,7 +2472,7 @@ private Map<String, String> getClaimMapping(String serviceProviderName, String t
                     claimMapping.put(resultSet.getString(2), resultSet.getString(1));
                 }
             }
-
+            connection.commit();
         } catch (IdentityException e) {
             throw new IdentityApplicationManagementException("Error while reading claim mappings.", e);
         } finally {
@@ -2537,12 +2539,12 @@ public List<String> getAllRequestedClaimsByServiceProvider(String serviceProvide
             getClaimPreStmt.setString(1, CharacterEncoder.getSafeText(serviceProviderName));
             getClaimPreStmt.setInt(2, tenantID);
             resultSet = getClaimPreStmt.executeQuery();
-
             while (resultSet.next()) {
                 if ("1".equalsIgnoreCase(resultSet.getString(3))) {
                     reqClaimUris.add(resultSet.getString(1));
                 }
             }
+            connection.commit();
         } catch (SQLException | IdentityException e) {
             throw new IdentityApplicationManagementException(
                     "Error while retrieving requested claims", e);

diff --git a/.../main/java/org/wso2/carbon/identity/application/mgt/dao/impl/OAuthApplicationDAOImpl.java b/.../main/java/org/wso2/carbon/identity/application/mgt/dao/impl/OAuthApplicationDAOImpl.java
@@ -49,7 +49,6 @@ public void removeOAuthApplication(String clientIdentifier) throws IdentityAppli
             prepStmt.setString(1, clientIdentifier);
             prepStmt.execute();
             connection.commit();
-
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);

diff --git a/....identity.mgt/src/main/java/org/wso2/carbon/identity/mgt/store/JDBCIdentityDataStore.java b/....identity.mgt/src/main/java/org/wso2/carbon/identity/mgt/store/JDBCIdentityDataStore.java
@@ -100,10 +100,7 @@ private boolean isExistingUserDataValue(String userName, int tenantId, String ke
                 return true;
             }
             connection.commit();
-        } catch (SQLException e) {
-            log.error("Error while retrieving user identity data in database", e);
-            throw new IdentityException("Error while retrieving user identity data in database", e);
-        } catch (IdentityException e) {
+        } catch (SQLException | IdentityException e) {
             log.error("Error while retrieving user identity data in database", e);
             throw new IdentityException("Error while retrieving user identity data in database", e);
         } finally {
@@ -128,10 +125,7 @@ private void addUserDataValue(String userName, int tenantId, String key, String
             prepStmt.setString(4, value);
             prepStmt.execute();
             connection.commit();
-        } catch (SQLException e) {
-            log.error("Error while persisting user identity data in database", e);
-            throw new IdentityException("Error while persisting user identity data in database", e);
-        } catch (IdentityException e) {
+        } catch (SQLException | IdentityException e) {
             log.error("Error while persisting user identity data in database", e);
             throw new IdentityException("Error while persisting user identity data in database", e);
         } finally {
@@ -155,10 +149,7 @@ private void updateUserDataValue(String userName, int tenantId, String key, Stri
             prepStmt.setString(4, key);
             prepStmt.executeUpdate();
             connection.commit();
-        } catch (SQLException e) {
-            log.error("Error while persisting user identity data in database", e);
-            throw new IdentityException("Error while persisting user identity data in database", e);
-        } catch (IdentityException e) {
+        } catch (SQLException | IdentityException e) {
             log.error("Error while persisting user identity data in database", e);
             throw new IdentityException("Error while persisting user identity data in database", e);
         } finally {
@@ -203,12 +194,9 @@ public UserIdentityClaimsDO load(String userName, UserStoreManager userStoreMana
             }
             dto = new UserIdentityClaimsDO(userName, data);
             dto.setTenantId(tenantId);
+            connection.commit();
             return dto;
-        } catch (SQLException e) {
-            log.error("Error while reading user identity data", e);
-        } catch (UserStoreException e) {
-            log.error("Error while reading user identity data", e);
-        } catch (IdentityException e) {
+        } catch (SQLException | IdentityException | UserStoreException e) {
             log.error("Error while reading user identity data", e);
         } finally {
             IdentityDatabaseUtil.closeResultSet(results);

diff --git a/...ntity.mgt/src/main/java/org/wso2/carbon/identity/mgt/store/JDBCUserRecoveryDataStore.java b/...ntity.mgt/src/main/java/org/wso2/carbon/identity/mgt/store/JDBCUserRecoveryDataStore.java
@@ -56,7 +56,6 @@ public void invalidate(UserRecoveryDataDO recoveryDataDO) throws IdentityExcepti
             prepStmt.setInt(2, recoveryDataDO.getTenantId());
             prepStmt.setString(3, recoveryDataDO.getCode());
             prepStmt.execute();
-            connection.setAutoCommit(false);
             connection.commit();
         } catch (SQLException e) {
             throw new IdentityException("Error while storing user identity data", e);
@@ -79,7 +78,6 @@ public void invalidate(String userId, int tenant) throws IdentityException {
             prepStmt = connection.prepareStatement(SQLQuery.INVALIDATE_METADATA);
             prepStmt.setString(1, userId);
             prepStmt.setInt(2, tenant);
-            connection.setAutoCommit(false);
             connection.commit();
         } catch (SQLException e) {
             throw new IdentityException("Error while invalidating user identity data", e);
@@ -179,6 +177,7 @@ public UserRecoveryDataDO[] load(String userName, int tenantId) throws IdentityE
                         results.getString(3), results.getString(4)));
             }
             UserRecoveryDataDO[] resultMetadata = new UserRecoveryDataDO[metada.size()];
+            connection.commit();
             return metada.toArray(resultMetadata);
         } catch (SQLException e) {
             throw new IdentityException("Error while reading user identity data", e);

diff --git a/...ntity.mgt/src/main/java/org/wso2/carbon/identity/mgt/store/UserIdentityMetadataStore.java b/...ntity.mgt/src/main/java/org/wso2/carbon/identity/mgt/store/UserIdentityMetadataStore.java
@@ -112,7 +112,6 @@ public void storeMetadata(IdentityMetadataDO metadata) throws IdentityException
             prepStmt.setString(4, metadata.getMetadata());
             prepStmt.setString(5, Boolean.toString(metadata.isValid()));
             prepStmt.execute();
-            connection.setAutoCommit(false);
             connection.commit();
         } catch (SQLException e) {
             throw new IdentityException("Error while storing user identity data", e);
@@ -177,7 +176,7 @@ public IdentityMetadataDO loadMetadata(String userName, int tenantId, String met
             prepStmt.setString(3, metadataType);
             prepStmt.setString(4, metadata);
             results = prepStmt.executeQuery();
-
+            connection.commit();
             if (results.next()) {
                 return new IdentityMetadataDO(results.getString(1), results.getInt(2),
                         results.getString(3), results.getString(4),
@@ -220,6 +219,7 @@ public IdentityMetadataDO[] loadMetadata(String userName, int tenantId)
                         Boolean.parseBoolean(results.getString(5))));
             }
             IdentityMetadataDO[] resultMetadata = new IdentityMetadataDO[metada.size()];
+            connection.commit();
             return metada.toArray(resultMetadata);
         } catch (SQLException e) {
             throw new IdentityException("Error while reading user identity data", e);
@@ -256,6 +256,7 @@ public IdentityMetadataDO[] loadMetadata(String userName, int tenantId, String m
                         Boolean.parseBoolean(results.getString(5))));
             }
             IdentityMetadataDO[] resultMetadata = new IdentityMetadataDO[metada.size()];
+            connection.commit();
             return metada.toArray(resultMetadata);
         } catch (SQLException e) {
             throw new IdentityException("Error while reading user identity data", e);

diff --git a/...t/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAO.java b/...t/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAO.java
@@ -124,6 +124,7 @@ public List<IdentityProvider> getIdPs(Connection dbConnection, int tenantId, Str
                     idps.add(identityProvider);
                 }
             }
+            dbConnection.commit();
             return idps;
         } catch (SQLException | IdentityException e) {
             log.error(e.getMessage(), e);
@@ -1020,6 +1021,7 @@ public IdentityProvider getIdPByName(Connection dbConnection, String idPName, in
                         dbConnection, idPName, idpId, tenantId));
 
             }
+            dbConnection.commit();
             return federatedIdp;
         } catch (SQLException | IdentityException e) {
             IdentityApplicationManagementUtil.rollBack(dbConnection);
@@ -1169,6 +1171,7 @@ public IdentityProvider getIdPByAuthenticatorPropertyValue(Connection dbConnecti
                         dbConnection, idPName, idpId, tenantId));
 
             }
+            dbConnection.commit();
             return federatedIdp;
         } catch (SQLException | IdentityException e) {
             IdentityApplicationManagementUtil.rollBack(dbConnection);
@@ -1213,6 +1216,7 @@ public IdentityProvider getIdPByRealmId(String realmId, int tenantId, String ten
             IdentityApplicationManagementUtil.closeStatement(prepStmt);
             IdentityApplicationManagementUtil.closeResultSet(rs);
 
+            dbConnection.commit();
             return getIdPByName(dbConnection, idPName, tenantId, tenantDomain);
         } catch (SQLException | IdentityException e) {
             throw new IdentityApplicationManagementException(
@@ -1602,6 +1606,7 @@ public boolean isIdpReferredBySP(String idPName, int tenantId)
                     isReffered = rsProvIdp.getInt(1) > 0;
                 }
             }
+            dbConnection.commit();
         } catch (SQLException | IdentityException e) {
             log.error(e.getMessage(), e);
             String msg = "Error occurred while searching for IDP references in SP ";
@@ -1681,6 +1686,7 @@ public IdentityProvider getPrimaryIdP(Connection dbConnection, int tenantId, Str
             prepStmt.setInt(1, tenantId);
             prepStmt.setString(2, "1");
             ResultSet rs = prepStmt.executeQuery();
+            dbConnection.commit();
             if (rs.next()) {
                 IdentityProvider identityProviderDO = new IdentityProvider();
                 identityProviderDO.setIdentityProviderName(rs.getString(1));
@@ -2384,6 +2390,7 @@ private int getIdentityProviderIdByName(Connection dbConnection, String idpName,
             prepStmt.setInt(2, MultitenantConstants.SUPER_TENANT_ID);
             prepStmt.setString(3, CharacterEncoder.getSafeText(idpName));
             rs = prepStmt.executeQuery();
+            dbConnection.commit();
             if (rs.next()) {
                 return rs.getInt(1);
             }
@@ -2489,6 +2496,7 @@ public boolean isSimilarIdPEntityIdsAvailble(String idPEntityId, int tenantId)
             if (rs.next()) {
                 isAvailable = rs.getInt(1) > 0;
             }
+            dbConnection.commit();
         } catch (SQLException | IdentityException e) {
             log.error(e.getMessage(), e);
             String msg = "Error occurred while searching for similar IdP EntityIds";

diff --git a/...2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java b/...2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java
@@ -167,6 +167,7 @@ public OAuthAppDO[] getOAuthConsumerAppsOfUser(String username, int tenantId) th
                 }
             }
             oauthAppsOfUser = oauthApps.toArray(new OAuthAppDO[oauthApps.size()]);
+            connection.commit();
         } catch (IdentityException e) {
             throw new IdentityOAuthAdminException("Error when getting an Identity Persistence Store instance.", e);
         } catch (SQLException e) {
@@ -223,6 +224,7 @@ public OAuthAppDO getAppInformation(String consumerKey) throws InvalidOAuthClien
 
                 throw new InvalidOAuthClientException("Cannot find an application associated with the given consumer key : " + consumerKey);
             }
+            connection.commit();
         } catch (IdentityException e) {
             throw new IdentityOAuth2Exception("Error while retrieving database connection" ,e);
         } catch (SQLException e) {
@@ -280,6 +282,7 @@ public OAuthAppDO getAppInformationByAppName(String appName) throws InvalidOAuth
                 log.debug(message);
                 throw new InvalidOAuthClientException(message);
             }
+            connection.commit();
         } catch (IdentityException e) {
             throw new IdentityOAuth2Exception("Error while retrieving database connection", e);
         } catch (SQLException e) {
@@ -357,6 +360,7 @@ private boolean isDuplicateApplication(String username, int tenantId, OAuthAppDO
             if (rSet.next()) {
                 isDuplicateApp = true;
             }
+            connection.commit();
         } catch (IdentityException e) {
             throw new IdentityOAuthAdminException("Error when getting an Identity Persistence Store instance.", e);
         } catch (SQLException e) {
@@ -383,6 +387,7 @@ private boolean isDuplicateConsumer(String consumerKey) throws IdentityOAuthAdmi
             if (rSet.next()) {
                 isDuplicateConsumer = true;
             }
+            connection.commit();
         } catch (IdentityException e) {
             throw new IdentityOAuthAdminException("Error when getting an Identity Persistence Store instance.", e);
         } catch (SQLException e) {

diff --git a/...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthConsumerDAO.java b/...bon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthConsumerDAO.java
@@ -75,6 +75,7 @@ public String getOAuthConsumerSecret(String consumerKey) throws IdentityOAuthAdm
             } else {
                 log.debug("Invalid Consumer Key : " + consumerKey);
             }
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);
@@ -117,6 +118,7 @@ public String getAuthenticatedUsername(String clientId, String clientSecret) thr
             } else {
                 log.debug("Invalid client id : " + clientId + ", and consumer secret : " + clientSecret);
             }
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);
@@ -160,6 +162,7 @@ public String getOAuthTokenSecret(String token, Boolean isAccessToken) throws Id
             prepStmt = connection.prepareStatement(sqlStmt);
             prepStmt.setString(1, token);
             resultSet = prepStmt.executeQuery();
+            connection.commit();
 
             if (resultSet.next()) {
                 tokenSecret = resultSet.getString(1);
@@ -298,7 +301,7 @@ public Parameters getRequestToken(String oauthToken) throws IdentityOAuthAdminEx
                 log.error("Invalid request token : " + oauthToken);
                 throw new IdentityException("Invalid request token. No such token issued.");
             }
-
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);
@@ -381,6 +384,7 @@ public String validateAccessToken(String consumerKey, String oauthToken, String
             } else {
                 throw new IdentityException("Invalid access token. No such token issued.");
             }
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);
@@ -415,6 +419,7 @@ private String getCallbackURLOfApp(String consumerKey) throws IdentityOAuthAdmin
             if (resultSet.next()) {
                 callbackURL = resultSet.getString(1);
             }
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);
@@ -445,6 +450,7 @@ private String getCallbackURLOfReqToken(String oauthToken) throws IdentityOAuthA
             if (resultSet.next()) {
                 callbackURL = resultSet.getString(1);
             }
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);

diff --git a/....carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/TokenMgtDAO.java b/....carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dao/TokenMgtDAO.java
@@ -301,7 +301,8 @@ public AccessTokenDO retrieveLatestAccessToken(String consumerKey, String userNa
                 prepStmt.setString(3, scope);
             }
             resultSet = prepStmt.executeQuery();
-
+            connection.commit();
+
             if (resultSet.next()) {
                 boolean returnToken = false;
                 String tokenState = resultSet.getString(7);
@@ -360,7 +361,7 @@ public Set<AccessTokenDO> retrieveAccessTokens(String consumerKey, String userNa
 
         Set<AccessTokenDO> accessTokenDOs = new HashSet<AccessTokenDO>();
 
-        Connection connection = null;
+        Connection connection;
         try {
             connection = JDBCPersistenceManager.getInstance().getDBConnection();
         } catch (IdentityException e) {
@@ -404,6 +405,7 @@ public Set<AccessTokenDO> retrieveAccessTokens(String consumerKey, String userNa
 
                 accessTokenDOs.add(dataDO);
             }
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance";
             throw new IdentityOAuth2Exception(errorMsg, e);
@@ -446,7 +448,7 @@ public AuthzCodeDO validateAuthorizationCode(String consumerKey, String authoriz
                         OAuth2Util.buildScopeArray(scopeString),
                         issuedTime, validityPeriod, callbackUrl);
             }
-
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);
@@ -576,7 +578,7 @@ public RefreshTokenValidationDataDO validateRefreshToken(String consumerKey, Str
                         ("UTC"))));
                 validationDataDO.setValidityPeriodInMillis(resultSet.getLong(6));
             }
-
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";
             log.error(errorMsg, e);
@@ -683,7 +685,7 @@ public AccessTokenDO retrieveAccessToken(String accessTokenIdentifier, boolean i
                 dataDO.setAccessToken(accessTokenIdentifier);
                 dataDO.setRefreshToken(refreshToken);
             }
-
+            connection.commit();
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance";
             throw new IdentityOAuth2Exception(errorMsg, e);
@@ -862,6 +864,7 @@ public String findScopeOfResource(String resourceUri) throws IdentityOAuth2Excep
             if (rs.next()) {
                 return rs.getString("SCOPE_KEY");
             }
+            connection.commit();
             return null;
         } catch (IdentityException e) {
             String errorMsg = "Error when getting an Identity Persistence Store instance.";