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

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

Author: alesj
Date: 2009-02-13 04:35:05 -0500 (Fri, 13 Feb 2009)
New Revision: 84159

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
Log:
Move old merging before we we put new stuff in it.

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	2009-02-13 09:30:09 UTC (rev 84158)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java	2009-02-13 09:35:05 UTC (rev 84159)
@@ -145,14 +145,15 @@
       Map<String, String> newOptions = fileSystemContext.getOptions();
       if (newOptions != null) // shouldn't be null, but we check anyway
       {
+         Map<String, String> oldOptions = oldVFSContext.getOptions();
+         if (oldOptions != null && oldOptions.isEmpty() == false)
+            newOptions.putAll(oldOptions);
+
          newOptions.put(VFSUtils.IS_TEMP_FILE, Boolean.TRUE.toString());
          // save old url
          URL handlerURL = handler.toVfsUrl();
          newOptions.put(VFSUtils.OLD_URL_STRING, handlerURL.toExternalForm());
       }
-      Map<String, String> oldOptions = oldVFSContext.getOptions();
-      if (newOptions != null && oldOptions != null && oldOptions.isEmpty() == false)
-         newOptions.putAll(oldOptions);
 
       // copy exception handler
       ExceptionHandler eh = oldVFSContext.getExceptionHandler();