User: ejort
Date: 02/01/05 04:08:52
Modified: src/main/org/jboss/ejb/plugins/jaws/jdbc
JDBCCreateEntityCommand.java
JDBCDestroyCommand.java
JDBCFindEntitiesCommand.java JDBCInitCommand.java
Log:
Guarded debug logging
Revision Changes Path
1.10 +5 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCreateEntityCommand.java
Index: JDBCCreateEntityCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCreateEntityCommand.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JDBCCreateEntityCommand.java 2001/11/24 20:43:25 1.9
+++ JDBCCreateEntityCommand.java 2002/01/05 12:08:51 1.10
@@ -37,7 +37,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*
* <p><b>Revisions:</b>
*
@@ -143,7 +143,8 @@
jdbcExecute(ctx);
} catch (Exception e)
{
- if (log.isDebugEnabled()) log.debug("Exception", e);
+ if (log.isDebugEnabled())
+ log.debug("Exception", e);
throw new CreateException("Could not create entity:"+e);
}
@@ -151,7 +152,8 @@
} catch (IllegalAccessException e)
{
- if (log.isDebugEnabled()) log.debug("IllegalAccessException", e);
+ if (log.isDebugEnabled())
+ log.debug("IllegalAccessException", e);
throw new CreateException("Could not create entity:"+e);
}
}
1.10 +5 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDestroyCommand.java
Index: JDBCDestroyCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDestroyCommand.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JDBCDestroyCommand.java 2001/11/24 20:43:25 1.9
+++ JDBCDestroyCommand.java 2002/01/05 12:08:51 1.10
@@ -20,7 +20,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*
* <p><b>Revisions:</b>
*
@@ -64,7 +64,8 @@
factory.getContainer().getTransactionManager().commit ();
} catch (Exception e)
{
- if (log.isDebugEnabled()) log.debug("Could not drop table " +
+ if (log.isDebugEnabled())
+ log.debug("Could not drop table " +
jawsEntity.getTableName(), e);
try
@@ -84,7 +85,8 @@
protected Object handleResult(int rowsAffected, Object argOrArgs)
throws Exception
{
- log.debug("Table "+jawsEntity.getTableName()+" removed");
+ if (log.isDebugEnabled())
+ log.debug("Table "+jawsEntity.getTableName()+" removed");
return null;
}
1.15 +16 -9
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFindEntitiesCommand.java
Index: JDBCFindEntitiesCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFindEntitiesCommand.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JDBCFindEntitiesCommand.java 2001/11/24 20:43:25 1.14
+++ JDBCFindEntitiesCommand.java 2002/01/05 12:08:51 1.15
@@ -31,7 +31,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*
* <p><b>Revisions:</b>
*
@@ -57,6 +57,8 @@
{
this.factory = factory;
+ boolean debug = log.isDebugEnabled();
+
// If finder method uses custom implementation, then it is used. This
overrides
// defined and automatic finders.
Class ejbClass = null;
@@ -76,7 +78,8 @@
String remoteName = "f"+name.substring(4);
try {
knownFinderCommands.put(remoteName, new
CustomFindByEntitiesCommand(m));
- log.debug("Added custom finder " + remoteName
+".");
+ if (debug)
+ log.debug("Added custom finder " + remoteName +".");
} catch (IllegalArgumentException e) {
log.error("Could not create the custom finder " +
remoteName+".", e);
}
@@ -110,9 +113,10 @@
// Make commands for any autogenerated finders required
Method[] homeMethods;
Method[] localHomeMethods;
- if (log.isDebugEnabled()) log.debug("AutoGenerated finders - Home="
- + factory.getContainer().getHomeClass()
- + " -- LocalHome=" + factory.getContainer().getLocalHomeClass());
+ if (debug)
+ log.debug("AutoGenerated finders - Home="
+ + factory.getContainer().getHomeClass()
+ + " -- LocalHome=" + factory.getContainer().getLocalHomeClass());
if (factory.getContainer().getHomeClass() != null)
{
homeMethods = factory.getContainer().getHomeClass().getMethods();
@@ -144,20 +148,23 @@
{
if (name.equals("findAll"))
{
- if (log.isDebugEnabled()) log.debug("Save AutoGenerated "+name+"
"+m);
+ if (debug)
+ log.debug("Save AutoGenerated "+name+" "+m);
FinderMetaData f = new FinderMetaData("findAll");
knownFinderCommands.put(name, factory.createFindAllCommand(f));
} else if (name.startsWith("findBy") &&
!name.equals("findByPrimaryKey"))
{
try
{
- if (log.isDebugEnabled()) log.debug("Save AutoGenerated "+name+"
"+m);
+ if (debug)
+ log.debug("Save AutoGenerated "+name+" "+m);
FinderMetaData f = new FinderMetaData(name);
knownFinderCommands.put(name, factory.createFindByCommand(m, f));
} catch (IllegalArgumentException e)
{
- if (log.isDebugEnabled()) log.debug("Could not create the finder
" + name +
- ", because no matching CMP field was
found.", e);
+ if (debug)
+ log.debug("Could not create the finder " + name +
+ ", because no matching CMP field was found.", e);
}
}
}
1.17 +20 -15
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCInitCommand.java
Index: JDBCInitCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCInitCommand.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JDBCInitCommand.java 2001/11/24 20:43:25 1.16
+++ JDBCInitCommand.java 2002/01/05 12:08:52 1.17
@@ -33,7 +33,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>danch (Dan Christopherson</a>
*
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*
* <p><b>Revisions:</b>
*
@@ -109,27 +109,28 @@
if (jawsEntity.getCreateTable())
{
// first check if the table already exists...
- // (a j2ee spec compatible jdbc driver has to fully
+ // (a j2ee spec compatible jdbc driver has to fully
// implement the DatabaseMetaData)
boolean created = false;
Connection con = null;
ResultSet rs = null;
- try
+ boolean debug = log.isDebugEnabled();
+ try
{
con = getConnection();
DatabaseMetaData dmd = con.getMetaData();
rs = dmd.getTables(con.getCatalog(), null, jawsEntity.getTableName(),
null);
if (rs.next ())
created = true;
-
+
rs.close ();
con.close ();
- }
- catch(Exception e)
+ }
+ catch(Exception e)
{
throw e;
- }
- finally
+ }
+ finally
{
if(rs != null) try {rs.close(); rs = null;}catch(SQLException e) {}
if(con != null) try {con.close();con = null;}catch(SQLException e) {}
@@ -140,7 +141,7 @@
log.info("Table '"+jawsEntity.getTableName()+"' already exists");
} else {
try
- {
+ {
// since we use the pools, we have to do this within a transaction
factory.getContainer().getTransactionManager().begin ();
jdbcExecute(null);
@@ -149,8 +150,9 @@
// Create successful, log this
log.info("Created table '"+jawsEntity.getTableName()+"'
successfully.");
if (jawsEntity.getPrimKeyField() != null)
- log.debug("Primary key of table
'"+jawsEntity.getTableName()+"' is '"
- +jawsEntity.getPrimKeyField()+"'.");
+ if (debug)
+ log.debug("Primary key of table '"+jawsEntity.getTableName()+"'
is '"
+ +jawsEntity.getPrimKeyField()+"'.");
else {
String flds = "[";
for (Iterator i = jawsEntity.getPkFields();i.hasNext();) {
@@ -158,11 +160,13 @@
flds += i.hasNext()?",":"";
}
flds += "]";
- log.debug("Primary key of table
'"+jawsEntity.getTableName()+"' is " + flds);
- }
+ if (debug)
+ log.debug("Primary key of table '"+jawsEntity.getTableName()+"' is "
+ flds);
+ }
} catch (Exception e)
{
- log.debug("Could not create table " +
+ if (debug)
+ log.debug("Could not create table " +
jawsEntity.getTableName(), e);
try
{
@@ -182,7 +186,8 @@
protected Object handleResult(int rowsAffected, Object argOrArgs)
throws Exception
{
- log.debug("Table " + jawsEntity.getTableName() + " created");
+ if (log.isDebugEnabled())
+ log.debug("Table " + jawsEntity.getTableName() + " created");
return null;
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
