felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r480621 - /incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
Date Wed, 29 Nov 2006 16:50:09 GMT
Author: rickhall
Date: Wed Nov 29 08:50:09 2006
New Revision: 480621

URL: http://svn.apache.org/viewvc?view=rev&rev=480621
Log:
Removed support for old bundle cache format before the first public release
(FELIX-94).

Modified:
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java?view=diff&rev=480621&r1=480620&r2=480621
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
(original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
Wed Nov 29 08:50:09 2006
@@ -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
+}



Mime
View raw message