Author: dkuleshov
Date: 2011-08-10 10:46:39 -0400 (Wed, 10 Aug 2011)
New Revision: 4734
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java
Log:
EXOJCR-1463: moved MimeDetector registration to static block
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java
===================================================================
---
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2011-08-10
12:50:17 UTC (rev 4733)
+++
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2011-08-10
14:46:39 UTC (rev 4734)
@@ -19,13 +19,13 @@
package org.exoplatform.commons.utils;
import eu.medsea.mimeutil.MimeUtil;
-import eu.medsea.mimeutil.detector.MimeDetector;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import java.io.IOException;
import java.io.InputStream;
+import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,7 +38,16 @@
{
protected static Log log =
ExoLogger.getLogger("org.exoplatform.commons.utils.MimeTypeResolver");
- private static MimeDetector magicMimeDetector;
+ static {
+ SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>()
+ {
+ public Void run()
+ {
+
MimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector");
+ return null;
+ }
+ });
+ }
private Map<String, List<String>> mimeTypes = new HashMap<String,
List<String>>();
@@ -54,11 +63,6 @@
{
public Void run() throws Exception
{
- if (magicMimeDetector == null)
- {
- magicMimeDetector =
-
MimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector");
- }
Scanner scanner = null;
String mimeTypeProperties =
System.getProperty("org.exoplatform.mimetypes");
if (mimeTypeProperties != null)
Show replies by date