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

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

Author: alesj
Date: 2008-11-13 07:41:42 -0500 (Thu, 13 Nov 2008)
New Revision: 80929

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
Log:
Copy options when copying file.

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-13 12:22:35 UTC (rev 80928)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java	2008-11-13 12:41:42 UTC (rev 80929)
@@ -30,12 +30,14 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.List;
+import java.util.Map;
 
 import org.jboss.logging.Logger;
 import org.jboss.util.id.GUID;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.plugins.context.DelegatingHandler;
 import org.jboss.virtual.plugins.context.file.FileSystemContext;
-import org.jboss.virtual.plugins.context.DelegatingHandler;
+import org.jboss.virtual.spi.VFSContext;
 import org.jboss.virtual.spi.VirtualFileHandler;
 
 /**
@@ -130,6 +132,14 @@
       File copy = copy(guidDir, handler);
       // create new handler
       FileSystemContext fileSystemContext = new FileSystemContext(copy);
+
+      // merge old options
+      VFSContext oldVFSContext = handler.getVFSContext();
+      Map<String, String> newOptions = fileSystemContext.getOptions();
+      Map<String, String> oldOptions = oldVFSContext.getOptions();
+      if (newOptions != null && oldOptions != null)
+         newOptions.putAll(oldOptions);
+
       VirtualFileHandler newHandler = fileSystemContext.getRoot();
       VirtualFileHandler parent = handler.getParent();
       if (parent != null && replaceOldHandler(parent, handler, newHandler))