Author: fanningpj
Date: Thu Oct 18 21:54:58 2018
New Revision: 1844288
URL: http://svn.apache.org/viewvc?rev=1844288&view=rev
Log:
XMLBEANS-506: NPE trying to load resource file if XmlBeans was loaded by the
bootstrap ClassLoader
Modified:
xmlbeans/trunk/CHANGES.txt
xmlbeans/trunk/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
Modified: xmlbeans/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/CHANGES.txt?rev=1844288&r1=1844287&r2=1844288&view=diff
==============================================================================
--- xmlbeans/trunk/CHANGES.txt (original)
+++ xmlbeans/trunk/CHANGES.txt Thu Oct 18 21:54:58 2018
@@ -1,3 +1,9 @@
+Changes in V3.0.2 since V3.0.1
+
+* XMLBEANS-520: wrong name for source(s) artifact
+* XMLBEANS-519: issue when using old XML parser versions
+* XMLBEANS-506: NPE trying to load resource file if XmlBeans was loaded by the
bootstrap ClassLoader
+
Changes in V3.0.1 since V3.0.0
* XMLBEANS-518: add support to XmlOptions to allow control over the XML parser
settings that affect DTD loading
Modified:
xmlbeans/trunk/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java?rev=1844288&r1=1844287&r2=1844288&view=diff
==============================================================================
---
xmlbeans/trunk/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
(original)
+++
xmlbeans/trunk/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
Thu Oct 18 21:54:58 2018
@@ -147,7 +147,7 @@ class FactoryFinder {
}
if (inputstream == null) {
- inputstream =
FactoryFinder.class.getClassLoader().getResourceAsStream(factoryResource);
+ inputstream =
FactoryFinder.class.getResourceAsStream(factoryResource);
}
return inputstream;
}
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java?rev=1844288&r1=1844287&r2=1844288&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java Thu Oct
18 21:54:58 2018
@@ -67,9 +67,8 @@ public abstract class Path
static
{
- ClassLoader cl = Path.class.getClassLoader();
String id =
"META-INF/services/org.apache.xmlbeans.impl.store.PathDelegate.SelectPathInterface";
- InputStream in = cl.getResourceAsStream(id);
+ InputStream in = Path.class.getResourceAsStream(id);
try
{
BufferedReader br = new BufferedReader(new InputStreamReader(in));
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java?rev=1844288&r1=1844287&r2=1844288&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java
(original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java Thu Oct
18 21:54:58 2018
@@ -52,9 +52,8 @@ public abstract class Query
static
{
- ClassLoader cl = Query.class.getClassLoader();
String id =
"META-INF/services/org.apache.xmlbeans.impl.store.QueryDelegate.QueryInterface";
- InputStream in = cl.getResourceAsStream(id);
+ InputStream in = Query.class.getResourceAsStream(id);
try
{
BufferedReader br = new BufferedReader(new InputStreamReader(in));
Modified:
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java?rev=1844288&r1=1844287&r2=1844288&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
(original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
Thu Oct 18 21:54:58 2018
@@ -76,7 +76,7 @@ public class CommandLine
{
try
{
-
IOUtil.copyCompletely(CommandLine.class.getClassLoader().getResourceAsStream("LICENSE.txt"),
System.out);
+
IOUtil.copyCompletely(CommandLine.class.getResourceAsStream("LICENSE.txt"),
System.out);
}
catch (Exception e)
{
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java?rev=1844288&r1=1844287&r2=1844288&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java Thu Oct 18
21:54:58 2018
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
public final class XmlBeans
{
private static String XMLBEANS_TITLE = "org.apache.xmlbeans";
- private static String XMLBEANS_VERSION = "2.6.0";
+ private static String XMLBEANS_VERSION = "3.0.2";
private static String XMLBEANS_VENDOR = "Apache Software Foundation";
static
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
