ConfiguratorFactory: removed JAXP message

Author: belaban

src/org/jgroups/conf/ConfiguratorFactory.java

@@ -23,9 +23,6 @@
  * @author Bela Ban
  */
 public class ConfiguratorFactory {
-    public static final String JAXP_MISSING_ERROR_MSG="the required XML parsing classes are not available; " +
-      "make sure that JAXP compatible libraries are in the classpath.";
-
 
     protected ConfiguratorFactory() {
     }
@@ -38,7 +35,6 @@ protected ConfiguratorFactory() {
      * @throws Exception if problems occur during the configuration of the protocol stack.
      */
     public static ProtocolStackConfigurator getStackConfigurator(File file) throws Exception {
-        checkJAXPAvailability();
         InputStream input=getConfigStream(file);
         return XmlConfigurator.getInstance(input);
     }
@@ -47,7 +43,6 @@ public static ProtocolStackConfigurator getStackConfigurator(InputStream input)
         return XmlConfigurator.getInstance(input);
     }
 
-
     /**
      * Returns a protocol stack configurator based on the provided properties string.
      * @param properties a string representing a system resource containing a JGroups XML configuration, a URL pointing
@@ -66,14 +61,10 @@ public static ProtocolStackConfigurator getStackConfigurator(String properties)
         throw new IllegalStateException(String.format("configuration %s not found or invalid", properties));
     }
 
-
-
     public static InputStream getConfigStream(File file) throws Exception {
         return new FileInputStream(Objects.requireNonNull(file));
     }
 
-
-
     /**
      * Returns a JGroups XML configuration InputStream based on the provided properties string.
      *
@@ -109,7 +100,6 @@ public static InputStream getConfigStream(String properties) throws IOException
         return configStream;
     }
 
-
     public static InputStream getConfigStream(Object properties) throws IOException {
         InputStream input=null;
 
@@ -148,9 +138,6 @@ public static InputStream getConfigStream(Object properties) throws IOException
         return new ByteArrayInputStream(((String)properties).getBytes());
     }
 
-
-
-
     /**
      * Returns an XmlConfigurator based on the provided properties string (if possible).
      *
@@ -163,34 +150,14 @@ public static InputStream getConfigStream(Object properties) throws IOException
      *                      JGroups XML configuration pointed to by the URL can not be parsed.
      */
     static XmlConfigurator getXmlConfigurator(String properties) throws IOException {
-        XmlConfigurator returnValue=null;
         try(InputStream configStream=getConfigStream(properties)) {
             if(configStream == null && properties.endsWith("xml"))
                 throw new FileNotFoundException(String.format(Util.getMessage("FileNotFound"), properties));
 
-            if(configStream != null) {
-                checkJAXPAvailability();
-                returnValue=XmlConfigurator.getInstance(configStream);
-            }
-        }
-        return returnValue;
-    }
-
-
-
-    /**
-     * Checks the availability of the JAXP classes on the classpath.
-     * @throws NoClassDefFoundError if the required JAXP classes are not availabile on the classpath.
-     */
-    static void checkJAXPAvailability() {
-        try {
-            XmlConfigurator.class.getName();
-        }
-        catch (NoClassDefFoundError error) {
-            Error tmp=new NoClassDefFoundError(JAXP_MISSING_ERROR_MSG);
-            tmp.initCause(error);
-            throw tmp;
+            if(configStream != null)
+                return XmlConfigurator.getInstance(configStream);
         }
+        return null;
     }
 
 }