[jboss-cvs] JBossAS SVN: r108813 - projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 22 16:16:07 EDT 2010
Author: maeste
Date: 2010-10-22 16:16:07 -0400 (Fri, 22 Oct 2010)
New Revision: 108813
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
Log:
fixing bug for AS7
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-10-22 19:52:25 UTC (rev 108812)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-10-22 20:16:07 UTC (rev 108813)
@@ -60,7 +60,15 @@
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
reader = inputFactory.createXMLStreamReader(xmlInputStream);
- return parse(reader);
+ try
+ {
+ return parse(reader);
+ }
+ finally
+ {
+ if (reader != null)
+ reader.close();
+ }
}
@Override
@@ -69,49 +77,41 @@
ResourceAdapters adapters = 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 RESOURCE_ADPTERS : {
- adapters = parseResourceAdapters(reader);
- break;
- }
- default :
- throw new ParserException("Unexpected element:" + reader.getLocalName());
+ switch (Tag.forName(reader.getLocalName()))
+ {
+ case RESOURCE_ADPTERS : {
+ adapters = parseResourceAdapters(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 adapters;
}
More information about the jboss-cvs-commits
mailing list