Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaf_classes/javax/activation/MailcapCommandMap.java	Fri Dec 13 17:20:01 2013 -0800
     1.2 +++ b/src/share/jaf_classes/javax/activation/MailcapCommandMap.java	Sun Dec 15 23:35:45 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -120,11 +120,7 @@
    1.11  public class MailcapCommandMap extends CommandMap {
    1.12      /*
    1.13       * We manage a collection of databases, searched in order.
    1.14 -     * The default database is shared between all instances
    1.15 -     * of this class.
    1.16 -     * XXX - Can we safely share more databases between instances?
    1.17       */
    1.18 -    private static MailcapFile defDB = null;
    1.19      private MailcapFile[] DB;
    1.20      private static final int PROG = 0;  // programmatically added entries
    1.21  
    1.22 @@ -164,14 +160,10 @@
    1.23          loadAllResources(dbv, "META-INF/mailcap");
    1.24  
    1.25          LogSupport.log("MailcapCommandMap: load DEF");
    1.26 -        synchronized (MailcapCommandMap.class) {
    1.27 -            // see if another instance has created this yet.
    1.28 -            if (defDB == null)
    1.29 -                defDB = loadResource("/META-INF/mailcap.default");
    1.30 -        }
    1.31 +        mf = loadResource("/META-INF/mailcap.default");
    1.32  
    1.33 -        if (defDB != null)
    1.34 -            dbv.add(defDB);
    1.35 +        if (mf != null)
    1.36 +            dbv.add(mf);
    1.37  
    1.38          DB = new MailcapFile[dbv.size()];
    1.39          DB = (MailcapFile[])dbv.toArray(DB);