[Firebird-checkins] CVS: client-java/src/main/org/firebirdsql/gds/impl/jni LocalGDSImpl.java, 1.1, 1.2 JniGDSImpl.java, 1.13, 1.14 NativeGDSImpl.java, 1.2, 1.3

[Roman R. <rro...@us...>]

Update of /cvsroot/firebird/client-java/src/main/org/firebirdsql/gds/impl/jni
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30606/src/main/org/firebirdsql/gds/impl/jni

Modified Files:
	LocalGDSImpl.java JniGDSImpl.java NativeGDSImpl.java 
Log Message:
merged with Branch_2_1

Index: LocalGDSImpl.java
===================================================================
RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/gds/impl/jni/LocalGDSImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -U3 -r1.1 -r1.2
--- LocalGDSImpl.java	10 May 2005 06:38:20 -0000	1.1
+++ LocalGDSImpl.java	29 Jun 2008 20:05:47 -0000	1.2
@@ -11,7 +11,7 @@
             false);
 
     private static final String[] LIST_OF_CLIENT_LIBRARIES_TO_TRY = {
-            "fbclient.dll", "libfbclient.so", "gds32.dll", "libgds.so",};
+            "fbclient.dll", "libfbclient.so"};
 
     public static final String LOCAL_TYPE_NAME = "LOCAL";
 

Index: JniGDSImpl.java
===================================================================
RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/gds/impl/jni/JniGDSImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -U3 -r1.13 -r1.14
--- JniGDSImpl.java	27 Dec 2006 16:18:40 -0000	1.13
+++ JniGDSImpl.java	29 Jun 2008 20:05:47 -0000	1.14
@@ -8,6 +8,8 @@
 
 public abstract class JniGDSImpl extends BaseGDSImpl {
 
+    private static final boolean DEVELOPMENT_DEBUG_OUTPUT = false;
+
     /**
      * Name of the JNI library able to communicate with the client or embedded
      * server library.
@@ -84,9 +86,10 @@
             try {
                 nativeInitilize(currentClientLibraryToTry);
             } catch (Throwable th) {
+                if (DEVELOPMENT_DEBUG_OUTPUT)
                 th.printStackTrace(); // Dont hide it completly
 
-                if (logging)
+                if (logging && DEVELOPMENT_DEBUG_OUTPUT)
                     System.out.println("Failed to load client library # " + i
                         + " - \"" + currentClientLibraryToTry + "\"."
                         + th.toString());

Index: NativeGDSImpl.java
===================================================================
RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/gds/impl/jni/NativeGDSImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -U3 -r1.2 -r1.3
--- NativeGDSImpl.java	25 Jun 2005 16:37:41 -0000	1.2
+++ NativeGDSImpl.java	29 Jun 2008 20:05:47 -0000	1.3
@@ -106,7 +106,7 @@
      * sucesfully.
      */
     private static final String[] CLIENT_LIBRARIES_TO_TRY = {
-            "fbclient.dll", "libfbclient.so", "gds32.dll", "libgds.so",};
+            "fbclient.dll", "libfbclient.so"};
 
     public static final String NATIVE_TYPE_NAME = "NATIVE";