Changeset 2010

Timestamp:

07/16/09 23:03:19 (3 years ago)

Author:

mswertz

Message:

BUGFIX: update of file attachments in mappers resulted in endless loop

Location:

molgenis3_3/src/org/molgenis/framework/data

Files:

• MappingDecorator.java (modified) (1 diff)
• jdbc/AbstractJDBCMapper.java (modified) (2 diffs)

molgenis3_3/src/org/molgenis/framework/data/MappingDecorator.java

@@ -17 +17 @@
 public class MappingDecorator<E extends Entity> implements JDBCMapper<E>
 {
-        private JDBCMapper<E> mapper;
+        protected JDBCMapper<E> mapper;
 
         public MappingDecorator(JDBCMapper<E> generatedMapper)

molgenis3_3/src/org/molgenis/framework/data/jdbc/AbstractJDBCMapper.java

@@ -75 +75 @@
                                 List<E> sublist = entities.subList(i, endindex);
                                 updatedRows += Math.max(this.executeAdd(sublist), superUpdatedRows);
-
-                                // update any mrefs for this entity
-                                this.storeMrefs(entities);
-
-                                // store file attachments and then update the file paths to them
-                                if (this.saveFileAttachements(entities, database.fileSource))
-                                {
-                                        this.update(sublist);
-                                }
+                        }
+                        
+                        // update any mrefs for this entity
+                        this.storeMrefs(entities);
+                        
+                        // store file attachments and then update the file paths to them
+                        if (this.saveFileAttachements(entities, database.fileSource))
+                        {
+                                this.update(entities);
                         }
 
@@ -167 +167 @@
                                 List<E> sublist = entities.subList(i, endindex);
 
+                                //put the files in their place
+                                this.saveFileAttachements(sublist, database.fileSource);
+                                
                                 updatedRows += Math.max(this.executeUpdate(sublist), superUpdatedRows);
-
-                                // rename file attachments with right name and update database
-                                this.storeMrefs(entities);
-                                if (this.saveFileAttachements(entities, database.fileSource))
-                                {
-                                        this.update(sublist);
-                                }
-                        }
+                        }
+                        
+                        // rename file attachments with right name and update database
+                        this.storeMrefs(entities);
 
                         database.commitPrivateTx(TX_TICKET);