[jboss-cvs] JBossAS SVN: r83392 - in projects/jboss-deployers/trunk: deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify and 1 other directories.

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

Author: alesj
Date: 2009-01-24 02:59:08 -0500 (Sat, 24 Jan 2009)
New Revision: 83392

Modified:
   projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractStructureDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
Log:
[JBDEPLOY-154]; ignore change if modification is already set.


Modified: projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java	2009-01-23 23:47:09 UTC (rev 83391)
+++ projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java	2009-01-24 07:59:08 UTC (rev 83392)
@@ -267,6 +267,8 @@
          builder.append(" relativeOrder=").append(getRelativeOrder());
       if (comparatorClassName != null)
          builder.append(" comparator=").append(getComparatorClassName());
+      if (modificationType != null)
+         builder.append(" modification=").append(modificationType);
    }
    
    @Override

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java	2009-01-23 23:47:09 UTC (rev 83391)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java	2009-01-24 07:59:08 UTC (rev 83392)
@@ -50,7 +50,14 @@
             StructureContext topSC = getTopStructureContext(structureContext);
             StructureMetaData topSMD = topSC.getMetaData();
             ContextInfo contextInfo = topSMD.getContext("");
-            contextInfo.setModificationType(modificationType);
+            if (contextInfo.getModificationType() != null)
+            {
+               log.debug("Ignoring modification type change, already set: " + contextInfo);
+            }
+            else
+            {
+               contextInfo.setModificationType(modificationType);
+            }
          }
          else
          {

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractStructureDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractStructureDeployer.java	2009-01-23 23:47:09 UTC (rev 83391)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractStructureDeployer.java	2009-01-24 07:59:08 UTC (rev 83392)
@@ -532,8 +532,17 @@
             result.setRelativeOrder(contextInfoOrder);
 
          ModificationType modificationType = context.getModificationType();
-         if (modificationType != null && result.getModificationType() == null)
-            result.setModificationType(modificationType);
+         if (modificationType != null)
+         {
+            if (result.getModificationType() != null)
+            {
+               log.debug("Ignoring modification type change, already set: " + result);
+            }
+            else
+            {
+               result.setModificationType(modificationType);
+            }
+         }
       }
    }
 }