svn commit: r420838 - in /incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache: BundleCache.java JarRevision.java

[ri...@apache.org]

Author: rickhall
Date: Tue Jul 11 06:27:45 2006
New Revision: 420838

URL: http://svn.apache.org/viewvc?rev=420838&view=rev
Log:
Modified JarRevision to log when an embedded JAR file is not found as
opposed to throwing an exception; this will need to be modified later
to fire a framework INFO event.

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

Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java?rev=420838&r1=420837&r2=420838&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java Tue Jul 11 06:27:45 2006
@@ -194,9 +194,6 @@
 
     /**
      * This method copies an input stream to the specified file.
-     * <p>
-     * Security: This method must be called from within a <tt>doPrivileged()</tt>
-     * block since it accesses the disk.
      * @param is the input stream to copy.
      * @param outputFile the file to which the input stream should be copied.
     **/

Modified: incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java?rev=420838&r1=420837&r2=420838&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java (original)
+++ incubator/felix/trunk/org.apache.felix.framework/src/main/java/org/apache/felix/framework/cache/JarRevision.java Tue Jul 11 06:27:45 2006
@@ -376,9 +376,6 @@
     /**
      * This method extracts an embedded JAR file from the bundle's
      * JAR file.
-     * <p>
-     * Security: This method must be called from within a <tt>doPrivileged()</tt>
-     * block since it accesses the disk.
      * @param id the identifier of the bundle that owns the embedded JAR file.
      * @param jarPath the path to the embedded JAR file inside the bundle JAR file.
     **/
@@ -404,7 +401,10 @@
                 ZipEntry ze = bundleJar.getEntry(jarPath);
                 if (ze == null)
                 {
-                    throw new IOException("No JAR entry: " + jarPath);
+// TODO: FRAMEWORK - Per the spec, this should fire a FrameworkEvent.INFO event;
+//       need to create an "Eventer" class like "Logger" perhaps.
+                    getLogger().log(Logger.LOG_INFO, "Class path entry not found: " + jarPath);
+                    return;
                 }
                 // If the zip entry is a directory, then ignore it since
                 // we don't need to extact it; otherwise, it points to an
@@ -439,4 +439,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}