You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by mo...@apache.org on 2001/06/05 17:53:08 UTC

cvs commit: jakarta-taglibs/jdbc/src/org/apache/taglibs/jdbc/statement StatementImplTag.java StatementTag.java

morgand     01/06/05 08:53:08

  Modified:    jdbc/src/org/apache/taglibs/jdbc/preparedstatement
                        PreparedStatementImplTag.java
               jdbc/src/org/apache/taglibs/jdbc/statement
                        StatementImplTag.java StatementTag.java
  Log:
  added exception when statements have a null connection
  
  Revision  Changes    Path
  1.5       +5 -2      jakarta-taglibs/jdbc/src/org/apache/taglibs/jdbc/preparedstatement/PreparedStatementImplTag.java
  
  Index: PreparedStatementImplTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/jdbc/src/org/apache/taglibs/jdbc/preparedstatement/PreparedStatementImplTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PreparedStatementImplTag.java	2001/04/30 15:53:58	1.4
  +++ PreparedStatementImplTag.java	2001/06/05 15:53:08	1.5
  @@ -105,8 +105,11 @@
     private PreparedStatement _statement = null;
     private int _rowCount = -1;
   
  -  public void setQuery(String query) throws SQLException{
  -    Connection conn = (Connection)pageContext.getAttribute(_connId);
  +  public void setQuery(String query) throws SQLException, JspTagException {
  +    Connection conn = (Connection)pageContext.findAttribute(_connId);
  +    if(conn == null) {
  +      throw new JspTagException("There is no such connection'"+_connId+"'");
  +    }
       _statement = conn.prepareStatement(query);
       pageContext.setAttribute(getId(), _statement);
     }
  
  
  
  1.6       +3 -0      jakarta-taglibs/jdbc/src/org/apache/taglibs/jdbc/statement/StatementImplTag.java
  
  Index: StatementImplTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/jdbc/src/org/apache/taglibs/jdbc/statement/StatementImplTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StatementImplTag.java	2001/05/03 18:16:11	1.5
  +++ StatementImplTag.java	2001/06/05 15:53:08	1.6
  @@ -134,6 +134,9 @@
   
       try {
         Connection conn = (Connection)pageContext.findAttribute(_connId);
  +      if(conn == null) {
  +        throw new JspTagException("There is no such connection'"+_connId+"'");
  +      }
         _statement = conn.createStatement();
         pageContext.setAttribute(getId(), _statement);
       } catch (SQLException e) {
  
  
  
  1.5       +3 -1      jakarta-taglibs/jdbc/src/org/apache/taglibs/jdbc/statement/StatementTag.java
  
  Index: StatementTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/jdbc/src/org/apache/taglibs/jdbc/statement/StatementTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StatementTag.java	2001/04/30 15:54:00	1.4
  +++ StatementTag.java	2001/06/05 15:53:08	1.5
  @@ -60,6 +60,8 @@
   import java.sql.ResultSet;
   import java.sql.SQLException;
   
  +import javax.servlet.jsp.JspTagException;
  +
   /**
    * <p>Interface for StatementImplTag and PreparedStatementImplTag.
    * Used to mask the differences between statements and preparedstatements
  @@ -81,7 +83,7 @@
      * @exception SQLException
      *                   throws an exception when a PreparedStatement cannot be created
      */
  -  public void setQuery(String query) throws SQLException;
  +  public void setQuery(String query) throws SQLException, JspTagException;
   
     /**
      * The id of a page context attribute containing a java.sql.Connection