You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2011/03/30 12:25:08 UTC

svn commit: r1086896 - /maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java

Author: cstamas
Date: Wed Mar 30 10:25:08 2011
New Revision: 1086896

URL: http://svn.apache.org/viewvc?rev=1086896&view=rev
Log:
MINDEXER-12: Applied Jesse's patch.

Modified:
    maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java

Modified: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java?rev=1086896&r1=1086895&r2=1086896&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java Wed Mar 30 10:25:08 2011
@@ -645,7 +645,7 @@ public class DefaultIndexUpdater
             throws IOException
         {
             super.commit();
-            
+
             updateRequest.getIndexingContext().commit();
         }
 
@@ -872,7 +872,16 @@ public class DefaultIndexUpdater
         catch ( IOException ex )
         {
             // try to look for legacy index transfer format
-            return target.setIndexFile( source, IndexingContext.INDEX_FILE_PREFIX + ".zip" );
+            try
+            {
+                return target.setIndexFile( source, IndexingContext.INDEX_FILE_PREFIX + ".zip" );
+            }
+            catch ( IOException ex2 )
+            {
+                getLogger().error( "Fallback to *.zip also failed: " + ex2 ); // do not bother with stack trace
+                
+                throw ex; // original exception more likely to be interesting
+            }
         }
     }