Rev 212: Fixed a null error in new ScanFilter helper method code. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 212
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Mon 2007-11-05 06:09:38 -0800
message:
  Fixed a null error in new ScanFilter helper method code. 
  Fixed merge error.
modified:
  interface/NdbScanFilter.i      ndbscanfilter.i-20070521223726-lvjwmtu5b6uvgsft-1
  java/com/mysql/cluster/ndbj/Ndb.java ndb.java-20070517181935-98huwjarzuh25b30-2
=== modified file 'interface/NdbScanFilter.i'
--- a/interface/NdbScanFilter.i	2007-11-03 14:53:09 +0000
+++ b/interface/NdbScanFilter.i	2007-11-05 14:09:38 +0000
@@ -83,7 +83,7 @@
 
   %ndbexception("NdbApiException") { 
     $action
-      if (result==null) { 
+      if (result==NULL) { 
 	NDB_exception(NdbApiException,"ScanFilter error" );
       }
   }

=== modified file 'java/com/mysql/cluster/ndbj/Ndb.java'
--- a/java/com/mysql/cluster/ndbj/Ndb.java	2007-11-05 13:50:40 +0000
+++ b/java/com/mysql/cluster/ndbj/Ndb.java	2007-11-05 14:09:38 +0000
@@ -178,23 +178,7 @@
 
 	public abstract int sendPollNdb(int aMillisecondNumber, int minNoOfEventsToWakeup)
throws NdbApiException;
 	
-        public abstract int sendPollNdb(int aMillisecondNumber) throws NdbApiException;
-
-	public NdbDictionary getDictionary() throws NdbApiException;
-
-	public int dropEventOperation(NdbEventOperationImpl eventOp) throws NdbApiException;
-
-	public NdbEventOperation createEventOperation(String eventName) throws NdbApiException;
-
-	public java.math.BigInteger getAutoIncrementValue(NdbTable myTable, long cacheSize)
throws NdbApiException;
-
-	public int sendPollNdb(int aMillisecondNumber, int minNoOfEventsToWakeup, int forceSend)
throws NdbApiException;
-
-	public int sendPollNdb(int aMillisecondNumber, int minNoOfEventsToWakeup) throws
NdbApiException;
-
-	public NdbEventOperationImpl nextEvent();
-
-	public int pollEvents(int aMillisecondNumber) throws NdbApiException;
+    public abstract int sendPollNdb(int aMillisecondNumber) throws NdbApiException;
 
 	public void sendPreparedTransactions(int forceSend);
 
@@ -210,12 +194,8 @@
 ;
 	public NdbTransactionImpl startTransaction(String aTableName, long keyData) throws
NdbApiException;
 
-	public NdbTransactionImpl startTransaction(NdbTable table, String anInputString) throws
NdbApiException;
-
 	public NdbTransactionImpl startTransaction(NdbTable table, short keyData) throws
NdbApiException;
 
-	public NdbTransactionImpl startTransaction(NdbTable table, int keyData) throws
NdbApiException;
-
 	public NdbTransactionImpl startTransaction(NdbTable table, long keyData) throws
NdbApiException;
 
 }