JDBC-482 Fix database connection in NetBeans 8.2 fails

FirebirdSQL · Mar 13, 2017 · 1204a26 · 1204a26
1 parent fb35941
commit 1204a26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/documentation/release_notes.md b/src/documentation/release_notes.md
@@ -237,6 +237,7 @@ The following has been changed or fixed since Jaybird 3.0.0-beta-3
     This restores the behavior of Jaybird 2.2 and should result in a minor 
     performance improvement when (fully) reading result sets or using
     `execute` instead of `executeUpdate` and **not** obtaining update counts.
+-   Fixed: Database connection in NetBeans 8.2 fails ([JDBC-483](http://tracker.firebirdsql.org/browse/JDBC-483)) 
 
 Changes in Jaybird 3.0.0-beta-3
 -------------------------------

diff --git a/src/main/org/firebirdsql/encodings/DefaultEncodingSet.java b/src/main/org/firebirdsql/encodings/DefaultEncodingSet.java
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Firebird Open Source JavaEE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
@@ -22,6 +20,7 @@
 
 import org.firebirdsql.encodings.xml.EncodingDefinitionType;
 import org.firebirdsql.encodings.xml.Encodings;
+import org.firebirdsql.encodings.xml.ObjectFactory;
 import org.firebirdsql.logging.Logger;
 import org.firebirdsql.logging.LoggerFactory;
 
@@ -97,7 +96,8 @@ protected String getXmlResourceName() {
     protected final Encodings loadEncodingsFromXml(String xmlFileResource) throws JAXBException {
         InputStream inputStream = null;
         try {
-            JAXBContext ctx = JAXBContext.newInstance(Encodings.class);
+            JAXBContext ctx = JAXBContext.newInstance(ObjectFactory.class.getPackage().getName(),
+                    ObjectFactory.class.getClassLoader());
             Unmarshaller unmarshaller = ctx.createUnmarshaller();
             inputStream = getClass().getResourceAsStream(xmlFileResource);
             if (inputStream == null) {
@@ -130,7 +130,7 @@ protected final List<EncodingDefinition> createEncodingDefinitions(String xmlFil
             if (encodings == null) {
                 return Collections.emptyList();
             }
-            List<EncodingDefinition> encodingSet = new ArrayList<EncodingDefinition>();
+            List<EncodingDefinition> encodingSet = new ArrayList<>();
             for (EncodingDefinitionType definition : encodings.getEncodingDefinition()) {
                 final EncodingDefinition encoding = createEncodingDefinition(definition);
                 if (encoding != null) {