[jboss-cvs] JBossAS SVN: r112357 - projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 18 21:53:28 EDT 2011
Author: jeff.zhang
Date: 2011-10-18 21:53:28 -0400 (Tue, 18 Oct 2011)
New Revision: 112357
Modified:
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyTxDataSourceImpl.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/Main.java
projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java
Log:
[JBJCA-679] resolve some findbug issue
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java 2011-10-18 20:27:13 UTC (rev 112356)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java 2011-10-19 01:53:28 UTC (rev 112357)
@@ -92,6 +92,8 @@
level++;
break;
}
+ default :
+ continue;
}
}
log.info("Skip parse " + reader.getLocalName());
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyTxDataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyTxDataSourceImpl.java 2011-10-18 20:27:13 UTC (rev 112356)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyTxDataSourceImpl.java 2011-10-19 01:53:28 UTC (rev 112357)
@@ -374,13 +374,13 @@
@Override
public Integer getAllocationRetry()
{
- return this.getAllocationRetry();
+ return this.timeOut.getAllocationRetry();
}
@Override
public Long getAllocationRetryWaitMillis()
{
- return this.getAllocationRetryWaitMillis();
+ return this.timeOut.getAllocationRetryWaitMillis();
}
@Override
@@ -392,7 +392,7 @@
@Override
public String getNewConnectionSql()
{
- return this.getNewConnectionSql();
+ return this.newConnectionSql;
}
@Override
@@ -423,13 +423,13 @@
public TrackStatementsEnum getTrackStatements()
{
- return this.getTrackStatements();
+ return this.statement.getTrackStatements();
}
@Override
public Boolean isPrefill()
{
- return this.isPrefill();
+ return this.pool.isPrefill();
}
@Override
@@ -441,13 +441,13 @@
@Override
public Long getPreparedStatementsCacheSize()
{
- return this.getPreparedStatementsCacheSize();
+ return this.statement.getPreparedStatementsCacheSize();
}
@Override
public Boolean isSharePreparedStatements()
{
- return this.isSharePreparedStatements();
+ return this.statement.isSharePreparedStatements();
}
@Override
@@ -465,19 +465,19 @@
@Override
public Long getUseTryLock()
{
- return this.getUseTryLock();
+ return this.timeOut.getUseTryLock();
}
@Override
public TransactionIsolation getTransactionIsolation()
{
- return this.getTransactionIsolation();
+ return this.transactionIsolation;
}
@Override
public boolean isNoTxSeparatePools()
{
- return this.isNoTxSeparatePools();
+ return false;
}
}
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java 2011-10-18 20:27:13 UTC (rev 112356)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java 2011-10-19 01:53:28 UTC (rev 112357)
@@ -369,13 +369,13 @@
@Override
public Integer getAllocationRetry()
{
- return this.getAllocationRetry();
+ return this.timeOut.getAllocationRetry();
}
@Override
public Long getAllocationRetryWaitMillis()
{
- return this.getAllocationRetryWaitMillis();
+ return this.timeOut.getAllocationRetryWaitMillis();
}
@Override
@@ -387,7 +387,7 @@
@Override
public String getNewConnectionSql()
{
- return this.getNewConnectionSql();
+ return this.newConnectionSql;
}
@Override
@@ -418,13 +418,13 @@
public TrackStatementsEnum getTrackStatements()
{
- return this.getTrackStatements();
+ return this.statement.getTrackStatements();
}
@Override
public Boolean isPrefill()
{
- return this.isPrefill();
+ return this.xaPool.isPrefill();
}
@Override
@@ -436,13 +436,13 @@
@Override
public Long getPreparedStatementsCacheSize()
{
- return this.getPreparedStatementsCacheSize();
+ return this.statement.getPreparedStatementsCacheSize();
}
@Override
public Boolean isSharePreparedStatements()
{
- return this.isSharePreparedStatements();
+ return this.statement.isSharePreparedStatements();
}
@Override
@@ -460,39 +460,39 @@
@Override
public Long getUseTryLock()
{
- return this.getUseTryLock();
+ return this.timeOut.getUseTryLock();
}
@Override
public Boolean isNoTxSeparatePools()
{
- return this.isNoTxSeparatePools();
+ return this.noTxSeparatePool;
}
@Override
public Boolean isTrackConnectionByTx()
{
- return this.isTrackConnectionByTx();
+ return false;
}
@Override
public Integer getXaResourceTimeout()
{
- return this.getXaResourceTimeout();
+ return this.timeOut.getXaResourceTimeout();
}
@Override
public String getXaDataSourceClass()
{
- return this.getXaDataSourceClass();
+ return this.xaDataSourceClass;
}
@Override
public Map<String, String> getXaDataSourceProperty()
{
- return this.getXaDataSourceProperty();
+ return this.xaDataSourceProperty;
}
@Override
@@ -504,25 +504,18 @@
@Override
public Boolean isInterleaving()
{
- return this.isInterleaving();
+ return this.interleaving;
}
@Override
public Boolean isPadXid()
{
- return this.isPadXid();
+ return this.padXid;
}
@Override
public Boolean isWrapXaResource()
{
- return this.isWrapXaResource();
+ return this.wrapXaDataSource;
}
-
- @Override
- public Boolean isNoTxSeparatePool()
- {
- return this.isNoTxSeparatePool();
- }
-
}
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/Main.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/Main.java 2011-10-18 20:27:13 UTC (rev 112356)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/Main.java 2011-10-19 01:53:28 UTC (rev 112357)
@@ -64,21 +64,35 @@
}
FileInputStream in = null;
FileOutputStream out = null;
+ String dsxml;
+
if (option.equals("-ds"))
{
- in = new FileInputStream(oldDsFilename);
- LegacyDsParser parser = new LegacyDsParser();
- DataSources ds = parser.parse(in);
- String dsxml = ds.toString();
-
- out = new FileOutputStream(newFilename);
- out.write(dsxml.getBytes(Charset.forName("UTF-8")));
+ try
+ {
+ in = new FileInputStream(oldDsFilename);
+ LegacyDsParser parser = new LegacyDsParser();
+ DataSources ds = parser.parse(in);
+ dsxml = ds.toString();
+ }
+ finally
+ {
+ if (in != null)
+ in.close();
+ }
+
+ try
+ {
+ out = new FileOutputStream(newFilename);
+ out.write(dsxml.getBytes(Charset.forName("UTF-8")));
+ }
+ finally
+ {
+
+ if (out != null)
+ out.close();
+ }
}
-
- if (in != null)
- in.close();
- if (out != null)
- out.close();
System.out.println("\nConvert successfully!");
System.exit(SUCCESS);
Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java 2011-10-18 20:27:13 UTC (rev 112356)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/XaDataSource.java 2011-10-19 01:53:28 UTC (rev 112357)
@@ -76,13 +76,6 @@
public Boolean isWrapXaResource();
/**
- * Get the noTxSeparatePool.
- *
- * @return the noTxSeparatePool.
- */
- public Boolean isNoTxSeparatePool();
-
- /**
*
* A Tag.
*/
More information about the jboss-cvs-commits
mailing list