User: starksm
Date: 01/09/08 20:31:10
Modified: src/main/org/jboss/deployment Tag: Branch_2_4
InstallerFactory.java
Log:
Include fix for JNDI createSubcontext() issue arising from previous fix.
Cleanup exception reported by InstallerFactory.findDeployment() due to
duplicate undeploy() call
Revision Changes Path
No revision
No revision
1.3.6.2 +10 -5 jboss/src/main/org/jboss/deployment/InstallerFactory.java
Index: InstallerFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/deployment/InstallerFactory.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- InstallerFactory.java 2001/08/03 20:36:27 1.3.6.1
+++ InstallerFactory.java 2001/09/09 03:31:10 1.3.6.2
@@ -10,13 +10,14 @@
import java.net.MalformedURLException;
import java.net.URLClassLoader;
import java.io.File;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.InputStream;
import java.io.IOException;
+import java.io.OutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.Iterator;
import java.util.Hashtable;
import java.util.Vector;
@@ -58,7 +59,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Schulze</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
- * @version $Revision: 1.3.6.1 $
+ * @version $Revision: 1.3.6.2 $
*/
public class InstallerFactory
{
@@ -197,6 +198,10 @@
{
result = loadConfig(new File(files[i], J2eeDeployer.CONFIG));
break;
+ }
+ catch(FileNotFoundException e)
+ {
+ // Ignore as the config may have been removed
}
catch (IOException _ioe)
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
