[jboss-cvs] JBossAS SVN: r81471 - projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy.

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

Author: alesj
Date: 2008-11-24 04:35:43 -0500 (Mon, 24 Nov 2008)
New Revision: 81471

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
Log:
Copy exception handler.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java	2008-11-24 08:58:47 UTC (rev 81470)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java	2008-11-24 09:35:43 UTC (rev 81471)
@@ -37,6 +37,7 @@
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.plugins.context.DelegatingHandler;
 import org.jboss.virtual.plugins.context.file.FileSystemContext;
+import org.jboss.virtual.spi.ExceptionHandler;
 import org.jboss.virtual.spi.VFSContext;
 import org.jboss.virtual.spi.VirtualFileHandler;
 
@@ -137,9 +138,14 @@
       VFSContext oldVFSContext = handler.getVFSContext();
       Map<String, String> newOptions = fileSystemContext.getOptions();
       Map<String, String> oldOptions = oldVFSContext.getOptions();
-      if (newOptions != null && oldOptions != null)
+      if (newOptions != null && oldOptions != null && oldOptions.isEmpty() == false)
          newOptions.putAll(oldOptions);
 
+      // copy exception handler
+      ExceptionHandler eh = oldVFSContext.getExceptionHandler();
+      if (eh != null)
+         fileSystemContext.setExceptionHandler(eh);
+
       VirtualFileHandler newHandler = fileSystemContext.getRoot();
       VirtualFileHandler parent = handler.getParent();
       if (parent != null && replaceOldHandler(parent, handler, newHandler))