[jboss-cvs] JBossAS SVN: r58275 - trunk/server/src/main/org/jboss/deployment

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

Author: scott.stark at jboss.org
Date: 2006-11-11 20:58:28 -0500 (Sat, 11 Nov 2006)
New Revision: 58275

Modified:
   trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
Log:
Correct the access of the descriptor input streams

Modified: trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2006-11-12 01:46:12 UTC (rev 58274)
+++ trunk/server/src/main/org/jboss/deployment/ClientDeployer.java	2006-11-12 01:58:28 UTC (rev 58275)
@@ -159,10 +159,12 @@
       ClientMetaData metaData = null;
       try
       {
-         InputStream in = unit.getMetaDataFile(APPLICATION_CLIENT_XML).openStream();
-         if (in == null)
+         VirtualFile appClientVF = unit.getMetaDataFile(APPLICATION_CLIENT_XML);
+         
+         if (appClientVF == null)
             throw new DeploymentException("No application-client.xml found");
 
+         InputStream in = appClientVF.openStream();
          XmlFileLoader xfl = new XmlFileLoader(true);
          Element appClient = xfl.getDocument(in, "application-client.xml").getDocumentElement();
          in.close();
@@ -171,13 +173,17 @@
          metaData.importClientXml(appClient);
 
          // Look for a jboss-client.xml descriptor
-         in = unit.getMetaDataFile(JBOSS_CLIENT_XML).openStream();
-         if (in != null)
+         VirtualFile jbossClientVF = unit.getMetaDataFile(JBOSS_CLIENT_XML);
+         if( jbossClientVF != null )
          {
-            xfl = new XmlFileLoader(true);
-            Element jbossClient = xfl.getDocument(in, "jboss-client.xml").getDocumentElement();
-            in.close();
-            metaData.importJbossClientXml(jbossClient);
+            in = jbossClientVF.openStream();
+            if (in != null)
+            {
+               xfl = new XmlFileLoader(true);
+               Element jbossClient = xfl.getDocument(in, "jboss-client.xml").getDocumentElement();
+               in.close();
+               metaData.importJbossClientXml(jbossClient);
+            }
          }
       }
       catch (IOException e)