geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r480762 - /geronimo/server/branches/1.2/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
Date Wed, 29 Nov 2006 23:06:56 GMT
Author: djencks
Date: Wed Nov 29 15:06:55 2006
New Revision: 480762

URL: http://svn.apache.org/viewvc?view=rev&rev=480762
Log:
GERONIMO-2580 fix misplaced } that broke comparison when environment contains more than one
dependency

Modified:
    geronimo/server/branches/1.2/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java

Modified: geronimo/server/branches/1.2/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?view=diff&rev=480762&r1=480761&r2=480762
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
Wed Nov 29 15:06:55 2006
@@ -85,17 +85,19 @@
                     matches = true;
                     break;
                 }
-                if (!matches) {
-        return false;
-    }
+            }
+            if (!matches) {
+                return false;
             }
         }
         return true;
     }
 
     private boolean matches(Dependency defaultDependency, Dependency actualDependency) {
-        if (defaultDependency.getArtifact().matches(actualDependency.getArtifact()) || actualDependency.getArtifact().matches(defaultDependency.getArtifact()))
{
-            return defaultDependency.getImportType() == actualDependency.getImportType()
|| actualDependency.getImportType() == ImportType.ALL;
+        if (defaultDependency.getArtifact().matches(actualDependency.getArtifact())
+                || actualDependency.getArtifact().matches(defaultDependency.getArtifact()))
{
+            return defaultDependency.getImportType() == actualDependency.getImportType()
+                    || actualDependency.getImportType() == ImportType.ALL;
         }
         return false;
     }



Mime
View raw message