[jboss-cvs] JBossAS SVN: r108814 - projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds.

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

Author: maeste
Date: 2010-10-22 16:16:31 -0400 (Fri, 22 Oct 2010)
New Revision: 108814

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
Log:
fixing a parsing bug in AS7 env

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2010-10-22 20:16:07 UTC (rev 108813)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2010-10-22 20:16:31 UTC (rev 108814)
@@ -68,7 +68,15 @@
 
       XMLInputFactory inputFactory = XMLInputFactory.newInstance();
       reader = inputFactory.createXMLStreamReader(xmlInputStream);
-      return parse(reader);
+      try
+      {
+         return parse(reader);
+      }
+      finally
+      {
+         if (reader != null)
+            reader.close();
+      }
    }
 
    @Override
@@ -77,49 +85,41 @@
 
       DataSources dataSources = null;
 
+      //iterate over tags
+      int iterate;
       try
       {
-
-         //iterate over tags
-         int iterate;
-         try
-         {
-            iterate = reader.nextTag();
+         iterate = reader.nextTag();
+      }
+      catch (XMLStreamException e)
+      {
+         //founding a non tag..go on. Normally non-tag found at beginning are comments or DTD declaration
+         iterate = reader.nextTag();
+      }
+      switch (iterate)
+      {
+         case END_ELEMENT : {
+            // should mean we're done, so ignore it.
+            break;
          }
-         catch (XMLStreamException e)
-         {
-            //founding a non tag..go on. Normally non-tag found at beginning are comments or DTD declaration
-            iterate = reader.nextTag();
-         }
-         switch (iterate)
-         {
-            case END_ELEMENT : {
-               // should mean we're done, so ignore it.
-               break;
-            }
-            case START_ELEMENT : {
+         case START_ELEMENT : {
 
-               switch (Tag.forName(reader.getLocalName()))
-               {
-                  case DATASOURCES : {
-                     dataSources = parseDataSources(reader);
-                     break;
-                  }
-                  default :
-                     throw new ParserException("Unexpected element:" + reader.getLocalName());
+            switch (Tag.forName(reader.getLocalName()))
+            {
+               case DATASOURCES : {
+                  dataSources = parseDataSources(reader);
+                  break;
                }
+               default :
+                  throw new ParserException("Unexpected element:" + reader.getLocalName());
+            }
 
-               break;
-            }
-            default :
-               throw new IllegalStateException();
+            break;
          }
+         default :
+            throw new IllegalStateException();
       }
-      finally
-      {
-         if (reader != null)
-            reader.close();
-      }
+
       return dataSources;
 
    }
@@ -228,7 +228,7 @@
                   return new XADataSourceImpl(transactionIsolation, timeOutSettings, securitySettings,
                                               statementSettings, validationSettings, urlDelimiter,
                                               urlSelectorStrategyClassName, useJavaContext, poolName, enabled,
-                                              jndiName, xaDataSourceProperty, xaDataSourceClass, module, 
+                                              jndiName, xaDataSourceProperty, xaDataSourceClass, module,
                                               newConnectionSql, xaPool);
                }
                else
@@ -360,11 +360,11 @@
                if (DataSources.Tag.forName(reader.getLocalName()) == DataSources.Tag.DATASOURCE)
                {
 
-                  return new DataSourceImpl(connectionUrl, driverClass, module, transactionIsolation, 
-                                            connectionProperties, timeOutSettings, securitySettings, 
-                                            statementSettings, validationSettings,
-                                            urlDelimiter, urlSelectorStrategyClassName, newConnectionSql,
-                                            useJavaContext, poolName, enabled, jndiName, pool);
+                  return new DataSourceImpl(connectionUrl, driverClass, module, transactionIsolation,
+                                            connectionProperties, timeOutSettings, securitySettings,
+                                            statementSettings, validationSettings, urlDelimiter,
+                                            urlSelectorStrategyClassName, newConnectionSql, useJavaContext, poolName,
+                                            enabled, jndiName, pool);
                }
                else
                {