User: dsundstrom Date: 02/01/15 14:26:41 Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc JDBCStopCommand.java Log: Converted from field arrays to lists. Revision Changes Path 1.9 +10 -11 jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStopCommand.java Index: JDBCStopCommand.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStopCommand.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- JDBCStopCommand.java 2002/01/05 12:08:51 1.8 +++ JDBCStopCommand.java 2002/01/15 22:26:41 1.9 @@ -12,6 +12,8 @@ import java.sql.ResultSet; import java.sql.Statement; import java.sql.SQLException; +import java.util.Iterator; +import java.util.List; import javax.sql.DataSource; import org.jboss.ejb.plugins.cmp.jdbc.bridge.JDBCCMRFieldBridge; @@ -27,7 +29,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Dain Sundstrom</a> * @author <a href="mailto:[EMAIL PROTECTED]">Rickard Öberg</a> * @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a> - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ */ public class JDBCStopCommand { @@ -50,17 +52,17 @@ public void execute() { if(entityMetaData.getRemoveTable()) { - if (log.isDebugEnabled()) - log.debug("Droping table for entity " + entity.getEntityName()); + log.debug("Droping table for entity " + entity.getEntityName()); dropTable(entity.getDataSource(), entityMetaData.getTableName()); } // drop relation tables - JDBCCMRFieldBridge[] cmrFields = entity.getJDBCCMRFields(); - for(int i=0; i<cmrFields.length; i++) { - JDBCRelationMetaData relationMetaData = - cmrFields[i].getRelationMetaData(); + List cmrFields = entity.getCMRFields(); + for(Iterator iter = cmrFields.iterator(); iter.hasNext();) { + JDBCCMRFieldBridge cmrField = (JDBCCMRFieldBridge)iter.next(); + JDBCRelationMetaData relationMetaData = cmrField.getRelationMetaData(); + if(relationMetaData.isTableMappingStyle() && relationMetaData.getTableExists()) { @@ -77,7 +79,6 @@ private void dropTable(DataSource dataSource, String tableName) { Connection con = null; ResultSet rs = null; - boolean debug = log.isDebugEnabled(); // was the table already delete? try { @@ -88,8 +89,7 @@ return; } } catch(SQLException e) { - if (debug) - log.debug("Error getting database metadata for DROP TABLE command. " + + log.debug("Error getting database metadata for DROP TABLE command. " + " DROP TABLE will not be executed. ", e); return; } finally { @@ -117,8 +117,7 @@ // success log.info("Dropped table '" + tableName + "' successfully."); } catch (Exception e) { - if (debug) - log.debug("Could not drop table " + tableName + ": " + e.getMessage()); + log.debug("Could not drop table " + tableName + ": " + e.getMessage()); try { manager.getContainer().getTransactionManager().rollback (); } catch (Exception _e) {
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development