Removed support for old bundle cache format before the first public release
(FELIX-94).
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@480621 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
index 676d900..a1e0718 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
@@ -201,21 +201,11 @@
m_revisions = new BundleRevision[revisionCount - 1];
}
- // Add the revision object for the most recent revision. We first try to read
- // the location from the current revision - if that fails we likely have
- // an old bundle cache and read the location the old way. The next
- // revision will update the bundle cache.
- // TODO: FRAMEWORK - This try catch block can eventually be deleted when we decide to remove
- // support for the old way, then we only need the first call to revise().
- try
- {
- revise(getRevisionLocation(revisionCount - 1), null);
- }
- catch (Exception ex)
- {
- m_logger.log(Logger.LOG_WARNING, getClass().getName() + ": Updating old bundle cache format.");
- revise(getCurrentLocation(), null);
- }
+ // Add the revision object for the most recent revision. We first try
+ // to read the location from the current revision - if that fails we
+ // likely have an old bundle cache and read the location the old way.
+ // The next revision will update the bundle cache.
+ revise(getRevisionLocation(revisionCount - 1), null);
}
/**
@@ -721,11 +711,6 @@
throw new Exception("Unable to revise archive.");
}
- // Set the current revision location to match.
- // TODO: FRAMEWORK - This can eventually be deleted when we removed
- // support for the old way of doing things.
- setCurrentLocation(location);
-
setRevisionLocation(location, (m_revisions == null) ? 0 : m_revisions.length);
// Add new revision to revision array.
@@ -764,10 +749,6 @@
String location = getRevisionLocation(m_revisions.length - 2);
- // TODO: FRAMEWORK - This can eventually be deleted when we removed
- // support for the old way of doing things.
- setCurrentLocation(location);
-
try
{
m_revisions[m_revisions.length - 1].dispose();
@@ -1222,4 +1203,4 @@
if (os != null) os.close();
}
}
-}
\ No newline at end of file
+}