Changeset 17823

Timestamp:

08/05/08 02:03:18 (3 weeks ago)

Author:

sjmittal

Message:

fix for 5795, deleting external added tasks too once the share is removed

Files:

• trunk/core/src/net/project/crossspace/ExportedObject.java (modified) (3 diffs)

trunk/core/src/net/project/crossspace/ExportedObject.java

@@ -22 +22 @@
-import java.util.List;
-
+import org.apache.log4j.Logger;
+
-import net.project.database.DBBean;
-import net.project.database.DatabaseUtils;
-import net.project.persistence.PersistenceException;
+import net.project.schedule.ScheduleEntry;
+import net.project.schedule.Task;
-
-/**
@@ -275 +279 @@
-        DBBean db = new DBBean();
-        try {
+            db.setAutoCommit(false);
+            
-            db.executeQuery(
-                "delete from pn_shareable_permissions where object_id in (" +
@@ -283 +289 @@
-                DatabaseUtils.collectionToCSV(Arrays.asList(idList)) + ")"
-            );
+            String deleteShareSQL = "delete from pn_shared where imported_object_id = ?";
+            ImportFinder finder = new ImportFinder();
+            List sharingObjects = finder.findByExportedIDs(db, Arrays.asList(idList));
+            db.prepareStatement(deleteShareSQL);
+            for (Iterator it = sharingObjects.iterator(); it.hasNext();) {
+                ImportedObject importedObject = (ImportedObject) it.next();
+                Task task = new Task();
+                task.setID(importedObject.getImportedObjectID());
+                task.remove();
+                //fix for bfd 5670 - remove this from the pn_shared table too
+                //note*: task.remove wont do that because we have not loaded the complete task here, just the reference
+                db.pstmt.setString(1, importedObject.getImportedObjectID());
+                db.executePrepared();
+            }
+            
+            db.commit();
-        } catch (SQLException sqle) {
+            try {
+                db.rollback();
+            } catch (SQLException e) {
+                Logger.getLogger(ScheduleEntry.class).debug("Unable to roll back task.");
+            }
-            throw new PersistenceException("Unable to remove shares.", sqle);
-        } finally {