[jboss-cvs] JBossAS SVN: r67927 - trunk/server/src/main/org/jboss/web/deployers.

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

Author: scott.stark at jboss.org
Date: 2007-12-05 00:14:20 -0500 (Wed, 05 Dec 2007)
New Revision: 67927

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
Only set the java2ClassLoadingCompliance if it was not set at the are level

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2007-12-05 05:13:20 UTC (rev 67926)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2007-12-05 05:14:20 UTC (rev 67927)
@@ -420,11 +420,12 @@
             }
          }
 
-         // 
          ClassLoadingMetaData classLoading = metaData.getClassLoading();
          if(classLoading == null)
             classLoading = new ClassLoadingMetaData();
-         classLoading.setJava2ClassLoadingCompliance(this.java2ClassLoadingCompliance);
+         // pass in the java2ClassLoadingCompliance if it was not set at the war level
+         if(classLoading.wasJava2ClassLoadingComplianceSet() == false)
+            classLoading.setJava2ClassLoadingCompliance(this.java2ClassLoadingCompliance);
          metaData.setClassLoading(classLoading);
 
          // Build the context root if its not been set or is specified at the ear