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

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

Author: jesper.pedersen
Date: 2012-03-08 14:37:41 -0500 (Thu, 08 Mar 2012)
New Revision: 112743

Modified:
   projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/upgrader/MavenMetadata.java
Log:
Bail if we can't resolve the version identifier

Modified: projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/upgrader/MavenMetadata.java
===================================================================
--- projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/upgrader/MavenMetadata.java	2012-03-08 18:52:13 UTC (rev 112742)
+++ projects/jboss-jca/trunk/as/src/main/java/org/jboss/jca/as/upgrader/MavenMetadata.java	2012-03-08 19:37:41 UTC (rev 112743)
@@ -21,6 +21,7 @@
  */
 package org.jboss.jca.as.upgrader;
 
+import java.io.IOException;
 import java.io.StringReader;
 
 import javax.xml.stream.XMLInputFactory;
@@ -38,8 +39,9 @@
     * Get the version from the specified url
     * @param url The url
     * @return The value
+    * @exception IOException Thrown if the version can't be resolved
     */
-   public static String getVersion(String url)
+   public static String getVersion(String url) throws IOException
    {
       try
       {
@@ -51,7 +53,9 @@
          XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
          XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(sr);
 
-         while (xmlStreamReader.hasNext())
+         String version = null;
+
+         while (version == null && xmlStreamReader.hasNext())
          {
             int eventCode = xmlStreamReader.next();
 
@@ -61,20 +65,23 @@
 
                   if ("value".equals(xmlStreamReader.getLocalName()))
                   {
-                     return readString(xmlStreamReader);
+                     version = readString(xmlStreamReader);
                   }
 
                   break;
                default :
             }
          }
+
+         if (version != null)
+            return version;
       }
       catch (Throwable t)
       {
-         // Nothing to do
+         throw new IOException("Unable to read: " + url, t);
       }
 
-      return null;
+      throw new IOException("Unable to read: " + url);
    }
 
    /**