[Firebird-checkins] SF.net SVN: firebird:[60464] client-java/trunk/src

[<mro...@us...>]

Revision: 60464
          http://sourceforge.net/p/firebird/code/60464
Author:   mrotteveel
Date:     2014-12-31 15:53:35 +0000 (Wed, 31 Dec 2014)
Log Message:
-----------
Enable JNA use from driver

Modified Paths:
--------------
    client-java/trunk/src/jna-client/org/firebirdsql/gds/ng/jna/FbClientDatabaseFactory.java
    client-java/trunk/src/main/org/firebirdsql/gds/impl/jni/NativeGDSFactoryPlugin.java

Modified: client-java/trunk/src/jna-client/org/firebirdsql/gds/ng/jna/FbClientDatabaseFactory.java
===================================================================
--- client-java/trunk/src/jna-client/org/firebirdsql/gds/ng/jna/FbClientDatabaseFactory.java	2014-12-31 15:52:54 UTC (rev 60463)
+++ client-java/trunk/src/jna-client/org/firebirdsql/gds/ng/jna/FbClientDatabaseFactory.java	2014-12-31 15:53:35 UTC (rev 60464)
@@ -41,6 +41,8 @@
  */
 public class FbClientDatabaseFactory implements FbDatabaseFactory {
 
+    private static final FbClientDatabaseFactory INSTANCE = new FbClientDatabaseFactory();
+
     @Override
     public JnaDatabase connect(IConnectionProperties connectionProperties) throws SQLException {
         final JnaConnection jnaConnection = new JnaConnection(getClientLibrary(), connectionProperties);
@@ -68,4 +70,8 @@
             }
         }
     }
+
+    public static FbClientDatabaseFactory getInstance() {
+        return INSTANCE;
+    }
 }

Modified: client-java/trunk/src/main/org/firebirdsql/gds/impl/jni/NativeGDSFactoryPlugin.java
===================================================================
--- client-java/trunk/src/main/org/firebirdsql/gds/impl/jni/NativeGDSFactoryPlugin.java	2014-12-31 15:52:54 UTC (rev 60463)
+++ client-java/trunk/src/main/org/firebirdsql/gds/impl/jni/NativeGDSFactoryPlugin.java	2014-12-31 15:53:35 UTC (rev 60464)
@@ -23,6 +23,7 @@
 import org.firebirdsql.gds.GDS;
 import org.firebirdsql.gds.GDSException;
 import org.firebirdsql.gds.impl.BaseGDSFactoryPlugin;
+import org.firebirdsql.gds.ng.jna.FbClientDatabaseFactory;
 
 public class NativeGDSFactoryPlugin extends BaseGDSFactoryPlugin {
 
@@ -73,5 +74,11 @@
 
     public GDS getGDS() {
         return GDSHolder.gds;
-    }   
+    }
+
+    @Override
+    public FbClientDatabaseFactory getDatabaseFactory() {
+        // TODO This needs to change if we are going to release jna-client as a separate jar
+        return FbClientDatabaseFactory.getInstance();
+    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.