You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/12/22 20:28:29 UTC

svn commit: r1721451 [3/3] - in /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory: GeodeticAuthorityFactory.java sql/CoordinateOperationSet.java sql/EPSGDataAccess.java sql/EPSGFactory.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java?rev=1721451&r1=1721450&r2=1721451&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java [UTF-8] Tue Dec 22 19:28:29 2015
@@ -35,6 +35,7 @@ import org.apache.sis.internal.metadata.
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
 import org.apache.sis.referencing.factory.ConcurrentAuthorityFactory;
+import org.apache.sis.referencing.factory.UnavailableFactoryException;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Localized;
 
@@ -192,8 +193,6 @@ public class EPSGFactory extends Concurr
         try {
             c = dataSource.getConnection();
             final EPSGDataAccess factory = createBackingStore(c);
-            factory.buffered = this;
-            factory.setLocale(locale);
             return factory;
         } catch (Exception e) {
             if (c != null) try {
@@ -201,7 +200,7 @@ public class EPSGFactory extends Concurr
             } catch (SQLException e2) {
                 e.addSuppressed(e2);
             }
-            throw new FactoryException(e.getLocalizedMessage(), e);
+            throw new UnavailableFactoryException(e.getLocalizedMessage(), e);
         }
     }
 
@@ -218,6 +217,6 @@ public class EPSGFactory extends Concurr
      * @return The backing store to use in {@code createFoo(String)} methods.
      */
     protected EPSGDataAccess createBackingStore(final Connection connection) throws SQLException {
-        return new EPSGDataAccess(connection, nameFactory, datumFactory, csFactory, crsFactory, copFactory, mtFactory);
+        return new EPSGDataAccess(this, connection);
     }
 }