geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r394234 - /geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
Date Sat, 15 Apr 2006 00:38:35 GMT
Author: djencks
Date: Fri Apr 14 17:38:31 2006
New Revision: 394234

URL: http://svn.apache.org/viewcvs?rev=394234&view=rev
Log:
Honor suppressDefaultEnvironment flag

Modified:
    geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java

Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java?rev=394234&r1=394233&r2=394234&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
(original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
Fri Apr 14 17:38:31 2006
@@ -87,7 +87,9 @@
 
     public static Environment buildEnvironment(EnvironmentType environmentType, Environment
defaultEnvironment) {
         Environment environment = buildEnvironment(environmentType);
-        mergeEnvironments(environment, defaultEnvironment);
+        if (!environment.isSuppressDefaultEnvironment()) {
+            mergeEnvironments(environment, defaultEnvironment);
+        }
         return environment;
     }
 



Mime
View raw message