commit bfb435aa6b24ec03c41821f2d9dfec6a55c6d991
author Richard S. Hall <rickhall@apache.org> Mon Mar 16 20:34:53 2009 +0000
committer Richard S. Hall <rickhall@apache.org> Mon Mar 16 20:34:53 2009 +0000
tree 1adca2e91164a387de493a9cc0b7652c89246255
parent e23f41a53d1feb4c9a43a6bbf579e5d62fa5f05a

Turned off JAR verification.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@754999 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/cache/JarContent.java

diff --git a/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java b/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
index 40be45a..5328ad2 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/JarContent.java
@@ -468,7 +468,7 @@
     {
         if (m_jarFile == null)
         {
-            m_jarFile = BundleCache.getSecureAction().openJAR(m_file);
+            m_jarFile = BundleCache.getSecureAction().openJAR(m_file, false);
         }
     }
 

framework/src/main/java/org/apache/felix/framework/util/JarFileX.java

diff --git a/framework/src/main/java/org/apache/felix/framework/util/JarFileX.java b/framework/src/main/java/org/apache/felix/framework/util/JarFileX.java
index a9b5e3f..5174529 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/JarFileX.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/JarFileX.java
@@ -83,6 +83,4 @@
         }
         return entry;
     }
-
-
-}
+}
\ No newline at end of file

framework/src/main/java/org/apache/felix/framework/util/SecureAction.java

diff --git a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
index a660234..fa300aa 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/SecureAction.java
@@ -515,15 +515,15 @@
         }
     }
 
-    public JarFile openJAR(File file, boolean verify) throws IOException
+    public JarFileX openJAR(File file, boolean verify) throws IOException
     {
         if (System.getSecurityManager() != null)
         {
             try
             {
                 Actions actions = (Actions) m_actions.get();
-                actions.set(Actions.OPEN_JAR_ACTION, file, (verify ? Boolean.TRUE : Boolean.FALSE));
-                return (JarFile) AccessController.doPrivileged(actions, m_acc);
+                actions.set(Actions.OPEN_JARX_VERIFY_ACTION, file, (verify ? Boolean.TRUE : Boolean.FALSE));
+                return (JarFileX) AccessController.doPrivileged(actions, m_acc);
             }
             catch (PrivilegedActionException ex)
             {
@@ -947,7 +947,7 @@
         public static final int START_ACTIVATOR_ACTION = 17;
         public static final int STOP_ACTIVATOR_ACTION = 18;
         public static final int SYSTEM_EXIT_ACTION = 19;
-        public static final int OPEN_JAR_ACTION= 20;
+        public static final int OPEN_JARX_VERIFY_ACTION = 20;
         public static final int GET_POLICY_ACTION = 21;
         public static final int CREATE_TMPFILE_ACTION = 22;
         public static final int OPEN_URLCONNECTION_ACTION = 23;
@@ -1096,7 +1096,7 @@
             {
                 return new JarFileX((File) arg1);
             }
-            else if (action == OPEN_JAR_ACTION)
+            else if (action == OPEN_JARX_VERIFY_ACTION)
             {
                 return new JarFile((File) arg1, ((Boolean) arg2).booleanValue());
             }