[jboss-cvs] JBossAS SVN: r112673 - projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2012-02-21 22:05:46 -0500 (Tue, 21 Feb 2012)
New Revision: 112673

Modified:
   projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyConnectionFactoryImp.java
   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/LegacyXaDataSourceImp.java
Log:
for converter findbugs

Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyConnectionFactoryImp.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyConnectionFactoryImp.java	2012-02-21 17:59:20 UTC (rev 112672)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyConnectionFactoryImp.java	2012-02-22 03:05:46 UTC (rev 112673)
@@ -174,7 +174,7 @@
    {
       pool = new CommonPoolImpl(minPoolSize, maxPoolSize, prefill, Defaults.USE_STRICT_MIN, Defaults.FLUSH_STRATEGY);
       this.noTxSeparatePool = noTxSeparatePool;
-      this.interleaving = interleaving;
+      this.setInterleaving(interleaving);
       return this;
    }
    
@@ -318,4 +318,22 @@
    {
       return null;
    }
+   
+   /**
+    * setInterleaving
+    * @param interleaving interleaving
+    */
+   public void setInterleaving(Boolean interleaving)
+   {
+      this.interleaving = interleaving;
+   }
+
+   /**
+    * getInterleaving
+    * @return Boolean interleaving
+    */
+   public Boolean getInterleaving()
+   {
+      return interleaving;
+   }
 }

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	2012-02-21 17:59:20 UTC (rev 112672)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyDsParser.java	2012-02-22 03:05:46 UTC (rev 112673)
@@ -213,7 +213,7 @@
       String newConnectionSql = null;
       
       //String driverClass = null;
-      String driver = null;
+      String driver = "";
       
       String xaDataSourceClass = null;
 
@@ -247,7 +247,7 @@
       
       TransactionIsolation transactionIsolation = TransactionIsolation.TRANSACTION_NONE;
       String securityDomain = DEFAULT_SECURITY_DOMAIN;
-      Extension reauthPlugin = null;
+      //Extension reauthPlugin = null;
       
       Boolean backgroundValidation = Defaults.BACKGROUND_VALIDATION;
       Long backgroundValidationMillis = null;
@@ -279,7 +279,7 @@
                         driver, transactionIsolation, xaDataSourceProperty);
                   xaDsImpl.buildTimeOut(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry, 
                         allocationRetryWaitMillis, xaResourceTimeout, setTxQueryTimeout, queryTimeout, useTryLock);
-                  xaDsImpl.buildDsSecurity(userName, password, securityDomain, reauthPlugin);
+                  xaDsImpl.buildDsSecurity(userName, password, securityDomain, null);
                   xaDsImpl.buildStatement(sharePreparedStatements, preparedStatementsCacheSize, trackStatements);
                   xaDsImpl.buildValidation(backgroundValidation, backgroundValidationMillis, useFastFail, 
                         validConnectionChecker, checkValidConnectionSql, validateOnMatch, staleConnectionChecker, 
@@ -488,8 +488,8 @@
    {
       String connectionUrl = null;
       String driverClass = null;
-      String dataSourceClass = null;
-      String driver = null;
+      String dataSourceClass = "";
+      String driver = "";
       Map<String, String> connectionProperties = new HashMap<String, String>();
 
       String urlDelimiter = null;
@@ -517,7 +517,7 @@
       Integer allocationRetry = null;
       Long allocationRetryWaitMillis = null;
       Long useTryLock = null;
-      Integer xaResourceTimeout = null;
+      Integer xaResourceTimeout = 0;
       
       Long preparedStatementsCacheSize = null;
       Boolean sharePreparedStatements = Defaults.SHARE_PREPARED_STATEMENTS;
@@ -526,7 +526,7 @@
       
       TransactionIsolation transactionIsolation = TransactionIsolation.TRANSACTION_NONE;
       String securityDomain = DEFAULT_SECURITY_DOMAIN;
-      Extension reauthPlugin = null;
+      //Extension reauthPlugin = null;
       
       Boolean backgroundValidation = Defaults.BACKGROUND_VALIDATION;
       Long backgroundValidationMillis = null;
@@ -552,7 +552,7 @@
                         driverClass, dataSourceClass, driver, transactionIsolation, connectionProperties);
                   txDsImpl.buildTimeOut(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry, 
                         allocationRetryWaitMillis, xaResourceTimeout, setTxQueryTimeout, queryTimeout, useTryLock);
-                  txDsImpl.buildDsSecurity(userName, password, securityDomain, reauthPlugin);
+                  txDsImpl.buildDsSecurity(userName, password, securityDomain, null);
                   txDsImpl.buildStatement(sharePreparedStatements, preparedStatementsCacheSize, trackStatements);
                   txDsImpl.buildValidation(backgroundValidation, backgroundValidationMillis, useFastFail, 
                         validConnectionChecker, checkValidConnectionSql, validateOnMatch, staleConnectionChecker, 

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	2012-02-21 17:59:20 UTC (rev 112672)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/converters/LegacyXaDataSourceImp.java	2012-02-22 03:05:46 UTC (rev 112673)
@@ -290,7 +290,7 @@
       this.jndiName = jndiName;
       this.spy = spy;
       this.useCcm = useCcm;
-      this.jta = jta;
+      this.setJta(jta);
       return this;
    }
    
@@ -525,4 +525,22 @@
    {
       return this.wrapXaDataSource;
    }
+
+   /**
+    * setJta
+    * @param jta jta
+    */
+   public void setJta(Boolean jta)
+   {
+      this.jta = jta;
+   }
+
+   /**
+    * getJta
+    * @return jta Boolean 
+    */
+   public Boolean getJta()
+   {
+      return jta;
+   }
 }