Fix Bug 21819986: Remove "synchronized" from JspFactory#setDefaultFactor and JspFactory#getDefaultFactory

Kin Man Chung · Kin Man Chung · commit ef76258841c8 · 2015-09-11T17:12:16.000Z
svn path=/trunk/; revision=1482
diff --git a/api/pom.xml b/api/pom.xml
@@ -131,6 +131,7 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <!-- Use default to include version in jar file name -->
@@ -182,6 +183,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.1</version>
                 <executions>
                   <execution>
                     <id>attach-javadocs</id>
diff --git a/api/src/main/java/javax/servlet/jsp/JspFactory.java b/api/src/main/java/javax/servlet/jsp/JspFactory.java
@@ -89,7 +89,7 @@
 
 public abstract class JspFactory {
 
-    private static JspFactory deflt = null;
+    private static volatile JspFactory deflt = null;
     
     /**
      * Sole constructor. (For invocation by subclass constructors, 
@@ -107,7 +107,7 @@ public JspFactory() {
      * @param deflt	The default factory implementation
      */
 
-    public static synchronized void setDefaultFactory(JspFactory deflt) {
+    public static void setDefaultFactory(JspFactory deflt) {
 	JspFactory.deflt = deflt;
     }
 
@@ -117,16 +117,7 @@ public static synchronized void setDefaultFactory(JspFactory deflt) {
      * @return the default factory for this implementation
      */
 
-    public static synchronized JspFactory getDefaultFactory() {
-        if (deflt == null) {
-            try {
-                Class factory = Class.forName("org.apache.jasper.runtime.JspFactoryImpl");
-                if (factory != null) {
-                    deflt = (JspFactory) factory.newInstance();
-                }
-            } catch (Exception ex) {
-            }
-        }
+    public static JspFactory getDefaultFactory() {
 	return deflt;
     }
 
