MonetDB: embedded-java - Avoid NPL when result set is not set

[Dimitar Nedev]

Changeset: c5f9b3933518 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5f9b3933518
Modified Files:
        
java/embedded/src/main/java/nl/cwi/monetdb/jdbc/MonetDBEmbeddedStatement.java
        java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
Branch: embedded-java
Log Message:

Avoid NPL when result set is not set

While there, add some javadoc


diffs (71 lines):

diff --git 
a/java/embedded/src/main/java/nl/cwi/monetdb/jdbc/MonetDBEmbeddedStatement.java 
b/java/embedded/src/main/java/nl/cwi/monetdb/jdbc/MonetDBEmbeddedStatement.java
--- 
a/java/embedded/src/main/java/nl/cwi/monetdb/jdbc/MonetDBEmbeddedStatement.java
+++ 
b/java/embedded/src/main/java/nl/cwi/monetdb/jdbc/MonetDBEmbeddedStatement.java
@@ -8,6 +8,9 @@ import java.sql.SQLFeatureNotSupportedEx
 import org.monetdb.embedded.MonetDBEmbedded;
 import org.monetdb.embedded.result.EmbeddedQueryResult;
 
+/**
+ * A JDBC statement for the embedded MonetDB.
+ */
 public class MonetDBEmbeddedStatement extends MonetStatement {
        private final MonetDBEmbedded database;
        private EmbeddedQueryResult resultSet;
@@ -18,15 +21,30 @@ public class MonetDBEmbeddedStatement ex
                this.database = database;
        }
        
+       /**
+        * Execute the SQL query.
+        * Need to call {@link 
nl.cwi.monetdb.jdbc.MonetDBEmbeddedStatement.getResultSet}
+        * to get the result set back, like in JDBC.
+        * <br />
+        * <strong>Note</strong>:Currently supports only single queries.
+        * 
+        * @param sql Query string
+        */
        @Override
        protected boolean internalExecute(String sql) throws SQLException {
                resultSet = database.query(sql);
                return false;
        }
        
+       /**
+        * Get the JDBC result set from previously executed query.
+        */
        @Override
-       public ResultSet getResultSet() throws SQLException{
-               return resultSet.getJDBCResultSet();
+       public ResultSet getResultSet() throws SQLException {
+               if (resultSet != null ) {
+                       return resultSet.getJDBCResultSet();                    
+               }
+               return null;
        }
        
        @Override
@@ -36,6 +54,8 @@ public class MonetDBEmbeddedStatement ex
        
        @Override
        public Connection getConnection() {
+               // There is no connection to return.
+               // And we can't return the the embedded database (since it's 
not a Connection type) 
                return null;
        }
 }
diff --git 
a/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java 
b/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
--- a/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
+++ b/java/embedded/src/main/java/org/monetdb/embedded/MonetDBEmbedded.java
@@ -103,6 +103,12 @@ public class MonetDBEmbedded {
                return queryWrapper(queryString);
        }
        
+       /**
+        * Create a JDBC statement for the embedded database.
+        * 
+        * @return The statement object
+        * @throws SQLException
+        */
        public MonetDBEmbeddedStatement createStatement() throws SQLException {
                return new MonetDBEmbeddedStatement(this);
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list