=== modified file 'interface/ndbapi/NdbClusterConnection.i'
--- a/interface/ndbapi/NdbClusterConnection.i	2008-02-20 21:39:51 +0000
+++ b/interface/ndbapi/NdbClusterConnection.i	2008-03-01 04:27:22 +0000
@@ -17,13 +17,6 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-// Need to do this here so it doesn't get overridden
-#if defined(SWIGJAVA)
-  %rename Ndb_cluster_connection NdbClusterConnectionImpl; 
-#else
-  %rename Ndb_cluster_connection NdbClusterConnection; 
-#endif
-
 class Ndb_cluster_connection {
 
 

=== modified file 'interface/ndbapi/ndbglobals.i'
--- a/interface/ndbapi/ndbglobals.i	2008-03-01 04:12:31 +0000
+++ b/interface/ndbapi/ndbglobals.i	2008-03-01 04:27:22 +0000
@@ -99,6 +99,9 @@
 %rename(NdbDictionary) NdbDictDictionary;
 %rename(NdbEvent) NdbDictEvent;
 
+/* Do this here so we can override it in the Java interface */
+%rename(Ndb_cluster_connection) NdbClusterConnection;
+
 long long getMicroTime();
 
 

=== modified file 'java/swig/NdbClusterConnection.i'
--- a/java/swig/NdbClusterConnection.i	2008-02-16 17:04:54 +0000
+++ b/java/swig/NdbClusterConnection.i	2008-03-01 04:27:22 +0000
@@ -17,6 +17,7 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+%rename Ndb_cluster_connection NdbClusterConnectionImpl; 
 
 %typemap(javainterfaces) Ndb_cluster_connection "NdbClusterConnection";