svn commit: r1556477 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java

[ghuber]

Author: ghuber
Date: Wed Jan  8 09:57:49 2014
New Revision: 1556477

URL: http://svn.apache.org/r1556477
Log:
pesky media files test fixes..

Modified:
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?rev=1556477&r1=1556476&r2=1556477&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
 Wed Jan  8 09:57:49 2014
@@ -318,6 +318,7 @@ public class JPAMediaFileManagerImpl imp
         strategy.store(mediaFile);
 
         // Refresh associated parent for changes
+        roller.flush();
         strategy.refresh(mediaFile.getDirectory());
 
         // update weblog last modified date. date updated by saveWeblog()
@@ -876,6 +877,7 @@ public class JPAMediaFileManagerImpl imp
                             : newDir.getPath()) + "/" + files[i].getName();
                     log.debug("    Upgrade file with original path: "
                             + originalPath);
+
                     MediaFile mf = new MediaFile();
                     try {
                         mf.setName(files[i].getName());
@@ -895,10 +897,12 @@ public class JPAMediaFileManagerImpl imp
                         mf.setInputStream(new FileInputStream(files[i]));
                         mf.setContentType(Utilities
                                 
.getContentTypeFromFileName(files[i].getName()));
-                        newDir.getMediaFiles().add(mf);
 
+                        // Create
                         this.roller.getMediaFileManager().createMediaFile(
                                 weblog, mf, messages);
+                        newDir.getMediaFiles().add(mf);
+
                         log.info(messages.toString());
 
                         fileCount++;