List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 1 2007 3:09pm
Subject:Rev 208: Merged init code change. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 208
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Thu 2007-11-01 15:09:04 +0000
message:
  Merged init code change.
modified:
  java/com/mysql/cluster/ndbj/NdbFactory.java
ndbfactory.java-20070517181935-98huwjarzuh25b30-13
  java/ndbj.i                    ndbj.i-20070913223244-5938mztpztyn9sry-1
    ------------------------------------------------------------
    revno: 192.1.25.1.13
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: ndbjmerge
    timestamp: Thu 2007-11-01 15:07:47 +0000
    message:
      Moved ndbj.so static loading code so that it actually works from outside of the
package.
    modified:
      java/com/mysql/cluster/ndbj/NdbFactory.java
ndbfactory.java-20070517181935-98huwjarzuh25b30-13
      java/ndbj.i                    ndbj.i-20070913223244-5938mztpztyn9sry-1
=== modified file 'java/com/mysql/cluster/ndbj/NdbFactory.java'
--- a/java/com/mysql/cluster/ndbj/NdbFactory.java	2007-10-01 19:55:09 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbFactory.java	2007-11-01 15:07:47 +0000
@@ -14,6 +14,16 @@
 {
 		
 
+  static {
+    try {
+      System.loadLibrary("ndbj");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. \n" + e);
+      System.exit(1);
+    }
+    ndbj.ndb_init();
+  }
+
     /**
      * This method is one of the first methods typically called in a NDB/J application. 
      * <br>It is a factory method used to create the top-level
NdbClusterConnectionImpl object.

=== modified file 'java/ndbj.i'
--- a/java/ndbj.i	2007-10-31 15:07:03 +0000
+++ b/java/ndbj.i	2007-11-01 15:09:04 +0000
@@ -317,19 +317,6 @@
 %}
 
 
-%pragma(java) modulecode=%{
-  static {
-    try {
-      System.loadLibrary("ndbj");
-    } catch (UnsatisfiedLinkError e) {
-      System.err.println("Native code library failed to load. \n" + e);
-      System.exit(1);
-    }
-    ndbj.ndb_init();
-  }
-%}
-
-
 %typemap(javainterfaces) Ndb_cluster_connection "NdbClusterConnection";
 %javamethodmodifiers Ndb_cluster_connection::deleteAllNdbObjects "protected";
 %typemap(javafinalize) Ndb_cluster_connection %{ 

Thread
Rev 208: Merged init code change. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor1 Nov