Changeset 1327

Timestamp:

05/17/11 11:24:03 (13 years ago)

Author:

twagoo

Message:

Exception handling (or logging at least) in ComponentRegistryDbImpl?

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (4 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -76 +76 @@
     @Override
     public ProfileDescription getProfileDescription(String id) {
-        return profileDescriptionDao.getByCmdId(id);
+        try {
+            return profileDescriptionDao.getByCmdId(id);
+        } catch (DataAccessException ex) {
+            LOG.error("Database access error while trying to get profile description", ex);
+            throw ex;
+        }
     }
 
@@ -95 +100 @@
     @Override
     public ComponentDescription getComponentDescription(String id) {
-        return componentDescriptionDao.getByCmdId(id);
+        try {
+            return componentDescriptionDao.getByCmdId(id);
+        } catch (DataAccessException ex) {
+            LOG.error("Database access error while trying to get component description", ex);
+            throw ex;
+        }
     }
 
     @Override
     public CMDComponentSpec getMDProfile(String id) {
-        return getMDComponent(id, profileDescriptionDao);
+        try {
+            return getMDComponent(id, profileDescriptionDao);
+        } catch (DataAccessException ex) {
+            LOG.error("Database access error while trying to get profile", ex);
+            throw ex;
+        }
     }
 
     @Override
     public CMDComponentSpec getMDComponent(String id) {
-        return getMDComponent(id, componentDescriptionDao);
+        try {
+            return getMDComponent(id, componentDescriptionDao);
+        } catch (DataAccessException ex) {
+            LOG.error("Database access error while trying to get component", ex);
+            throw ex;
+        }
     }
 
@@ -177 +197 @@
     @Override
     public void deleteMDProfile(String profileId, Principal principal) throws IOException, UserUnauthorizedException, DeleteFailedException {
-        ProfileDescription desc = getProfileDescription(profileId);
-        if (desc != null) {
-            checkAuthorisation(desc, principal);
-            checkAge(desc, principal);
-            profileDescriptionDao.setDeleted(profileId);
-        }
+        try {
+            ProfileDescription desc = getProfileDescription(profileId);
+            if (desc != null) {
+                checkAuthorisation(desc, principal);
+                checkAge(desc, principal);
+                profileDescriptionDao.setDeleted(profileId);
+            }
+        } catch (DataAccessException ex) {
+            LOG.error("Database access error while trying to delete profile", ex);
+            throw ex;
+        }
+
     }
 
@@ -217 +243 @@
     @Override
     public void deleteMDComponent(String componentId, Principal principal, boolean forceDelete) throws IOException, UserUnauthorizedException, DeleteFailedException {
-        ComponentDescription desc = componentDescriptionDao.getByCmdId(componentId);
-        if (desc != null) {
-            checkAuthorisation(desc, principal);
-            checkAge(desc, principal);
-
-            // TODO : check still used!
+        try {
+            ComponentDescription desc = componentDescriptionDao.getByCmdId(componentId);
+            if (desc != null) {
+                checkAuthorisation(desc, principal);
+                checkAge(desc, principal);
+
+                // TODO : check still used!
 //            if (!forceDelete) {
 //                checkStillUsed(componentId);
 //            }
-            componentDescriptionDao.setDeleted(componentId);
+                componentDescriptionDao.setDeleted(componentId);
+            }
+        } catch (DataAccessException ex) {
+            LOG.error("Database access error while trying to delete component", ex);
+            throw ex;
         }
     }