You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2020/01/14 13:34:22 UTC
svn commit: r1872780 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils:
XPathFactory.java XalanXPathAPI.java
Author: coheigea
Date: Tue Jan 14 13:34:21 2020
New Revision: 1872780
URL: http://svn.apache.org/viewvc?rev=1872780&view=rev
Log:
Remove some unnecessary synchronized blocks
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java?rev=1872780&r1=1872779&r2=1872780&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java Tue Jan 14 13:34:21 2020
@@ -25,29 +25,27 @@ package org.apache.xml.security.utils;
*/
public abstract class XPathFactory {
- private static boolean xalanInstalled;
+ private static final boolean xalanInstalled;
static {
+ boolean installed = false;
try {
Class<?> funcTableClass =
ClassLoaderUtils.loadClass("org.apache.xpath.compiler.FunctionTable", XPathFactory.class);
if (funcTableClass != null) {
- xalanInstalled = true;
+ installed = true;
}
} catch (Exception e) { //NOPMD
//ignore
}
- }
-
- protected static synchronized boolean isXalanInstalled() {
- return xalanInstalled;
+ xalanInstalled = installed;
}
/**
* Get a new XPathFactory instance
*/
public static XPathFactory newInstance() {
- if (!isXalanInstalled()) {
+ if (!xalanInstalled) {
return new JDKXPathFactory();
}
// Xalan is available
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java?rev=1872780&r1=1872779&r2=1872780&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java Tue Jan 14 13:34:21 2020
@@ -107,7 +107,7 @@ public class XalanXPathAPI implements XP
context = null;
}
- public static synchronized boolean isInstalled() {
+ public static boolean isInstalled() {
return installed;
}