Merge pull request #1355 from jdcasey/master

Restore readonly status on CacheOnlyLocation if it gets overridden.

Author: jdcasey

core/src/main/java/org/commonjava/indy/core/content/DefaultDownloadManager.java

@@ -623,14 +623,25 @@ else if ( !deploy.isAllowReleases() )
         try
         {
             KeyedLocation loc = LocationUtils.toLocation( store );
-            if ( isIgnoreReadonly( eventMetadata ) && loc instanceof CacheOnlyLocation )
+            boolean resetReadonly = ( !loc.allowsStoring() && isIgnoreReadonly( eventMetadata ) && loc instanceof CacheOnlyLocation );
+            try
+            {
+                if ( resetReadonly )
+                {
+                    ( (CacheOnlyLocation) loc ).setReadonly( false );
+                }
+                final ConcreteResource resource = new ConcreteResource( loc, path );
+                Transfer txfr = transfers.store( resource, stream, eventMetadata );
+                nfc.clearMissing( resource );
+                return txfr;
+            }
+            finally
             {
-                ( (CacheOnlyLocation) loc ).setReadonly( false );
+                if ( resetReadonly )
+                {
+                    ( (CacheOnlyLocation) loc ).setReadonly( true );
+                }
             }
-            final ConcreteResource resource = new ConcreteResource( loc, path );
-            Transfer txfr = transfers.store( resource, stream, eventMetadata );
-            nfc.clearMissing( resource );
-            return txfr;
         }
         catch ( final BadGatewayException e )
         {
@@ -1017,12 +1028,23 @@ private Boolean doDelete( final Transfer item, final EventMetadata eventMetadata
         try
         {
             Location loc = item.getLocation();
-            if ( isIgnoreReadonly( eventMetadata ) && loc instanceof CacheOnlyLocation )
+            boolean resetReadonly = ( !loc.allowsStoring() && isIgnoreReadonly( eventMetadata ) && loc instanceof CacheOnlyLocation );
+            try
+            {
+                if ( resetReadonly )
+                {
+                    ( (CacheOnlyLocation) loc ).setReadonly( false );
+                }
+                final ConcreteResource resource = new ConcreteResource( loc, item.getPath() );
+                transfers.delete( resource, eventMetadata );
+            }
+            finally
             {
-                ( (CacheOnlyLocation) loc ).setReadonly( false );
+                if ( resetReadonly )
+                {
+                    ( (CacheOnlyLocation) loc ).setReadonly( true );
+                }
             }
-            final ConcreteResource resource = new ConcreteResource( loc, item.getPath() );
-            transfers.delete( resource, eventMetadata );
         }
         catch ( final TransferException e )
         {