XMLBEANS-506: NPE trying to load resource file if XmlBeans was loaded by the bootstrap ClassLoader
git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1844288 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 11ea138..5e6abb6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java b/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
index 9b73b6d..c826933 100644
--- a/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
+++ b/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
@@ -147,7 +147,7 @@
}
if (inputstream == null) {
- inputstream = FactoryFinder.class.getClassLoader().getResourceAsStream(factoryResource);
+ inputstream = FactoryFinder.class.getResourceAsStream(factoryResource);
}
return inputstream;
}
diff --git a/src/store/org/apache/xmlbeans/impl/store/Path.java b/src/store/org/apache/xmlbeans/impl/store/Path.java
index 7d50fac..015eea6 100755
--- a/src/store/org/apache/xmlbeans/impl/store/Path.java
+++ b/src/store/org/apache/xmlbeans/impl/store/Path.java
@@ -67,9 +67,8 @@
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));
diff --git a/src/store/org/apache/xmlbeans/impl/store/Query.java b/src/store/org/apache/xmlbeans/impl/store/Query.java
index 8fef064..0b8accc 100644
--- a/src/store/org/apache/xmlbeans/impl/store/Query.java
+++ b/src/store/org/apache/xmlbeans/impl/store/Query.java
@@ -52,9 +52,8 @@
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));
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java b/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
index ab2ec4f..55c1ecd 100644
--- a/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
+++ b/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
@@ -76,7 +76,7 @@
{
try
{
- IOUtil.copyCompletely(CommandLine.class.getClassLoader().getResourceAsStream("LICENSE.txt"), System.out);
+ IOUtil.copyCompletely(CommandLine.class.getResourceAsStream("LICENSE.txt"), System.out);
}
catch (Exception e)
{
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java b/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
index 9445957..14bbe64 100644
--- a/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
+++ b/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
@@ -35,7 +35,7 @@
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
