Bug 482673 Make Storage.needsDiscarding(Generation) faster

Change-Id: I2bb4a644e73e63ce532996607bfc788a53686508
Signed-off-by: Ed Merks <ed.merks@gmail.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
index 65d7b4394..f87e0019f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
@@ -24,7 +24,10 @@ import org.eclipse.osgi.framework.log.FrameworkLogEntry;
 import org.eclipse.osgi.framework.util.*;
 import org.eclipse.osgi.internal.container.LockSet;
 import org.eclipse.osgi.internal.debug.Debug;
-import org.eclipse.osgi.internal.framework.*;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
+import org.eclipse.osgi.internal.framework.EquinoxContainer;
+import org.eclipse.osgi.internal.framework.EquinoxContainerAdaptor;
+import org.eclipse.osgi.internal.framework.FilterImpl;
 import org.eclipse.osgi.internal.hookregistry.BundleFileWrapperFactoryHook;
 import org.eclipse.osgi.internal.hookregistry.StorageHookFactory;
 import org.eclipse.osgi.internal.hookregistry.StorageHookFactory.StorageHook;
@@ -230,15 +233,16 @@ public class Storage {
 			}
 		}
 		File content = generation.getContent();
-		if (!content.exists()) {
-			// the content got deleted since last time!
-			return true;
-		}
 		if (getConfiguration().inCheckConfigurationMode()) {
-			if (generation.isDirectory())
+			if (generation.isDirectory()) {
 				content = new File(content, "META-INF/MANIFEST.MF"); //$NON-NLS-1$
+			}
 			return generation.getLastModified() != secureAction.lastModified(content);
 		}
+		if (!content.exists()) {
+			// the content got deleted since last time!
+			return true;
+		}
 		return false;
 	}