svn commit: r1629604 - in /tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic: Assembler.java ComparableValidationConfig.java

[rmannibucau]

Author: rmannibucau
Date: Mon Oct  6 10:12:34 2014
New Revision: 1629604

URL: http://svn.apache.org/r1629604
Log:
style + missing methods (wrong refactoring in previous commit)

Modified:
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ComparableValidationConfig.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1629604&r1=1629603&r2=1629604&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Mon Oct  6 10:12:34 2014
@@ -92,6 +92,7 @@ import org.apache.openejb.jpa.integratio
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.JarLocation;
 import org.apache.openejb.loader.Options;
+import org.apache.openejb.loader.ProvisioningUtil;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.monitoring.DynamicMBeanWrapper;
 import org.apache.openejb.monitoring.LocalMBeanServer;
@@ -531,6 +532,10 @@ public class Assembler extends Assembler
         }
     }
 
+    public boolean isDeployed(final String path) {
+        return 
deployedApplications.containsKey(ProvisioningUtil.realLocation(path));
+    }
+
     public Collection<AppInfo> getDeployedApplications() {
         return new ArrayList<AppInfo>(deployedApplications.values());
     }

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ComparableValidationConfig.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ComparableValidationConfig.java?rev=1629604&r1=1629603&r2=1629604&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ComparableValidationConfig.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ComparableValidationConfig.java
 Mon Oct  6 10:12:34 2014
@@ -59,18 +59,24 @@ public class ComparableValidationConfig 
 
         final ComparableValidationConfig that = (ComparableValidationConfig) o;
 
-        if (constraintFactoryClass != null ? 
!constraintFactoryClass.equals(that.constraintFactoryClass) : 
that.constraintFactoryClass != null)
+        if (constraintFactoryClass != null ? 
!constraintFactoryClass.equals(that.constraintFactoryClass) : 
that.constraintFactoryClass != null) {
             return false;
-        if (constraintMappings != null ? 
!constraintMappings.equals(that.constraintMappings) : that.constraintMappings 
!= null)
+        }
+        if (constraintMappings != null ? 
!constraintMappings.equals(that.constraintMappings) : that.constraintMappings 
!= null) {
             return false;
-        if (messageInterpolatorClass != null ? 
!messageInterpolatorClass.equals(that.messageInterpolatorClass) : 
that.messageInterpolatorClass != null)
+        }
+        if (messageInterpolatorClass != null ? 
!messageInterpolatorClass.equals(that.messageInterpolatorClass) : 
that.messageInterpolatorClass != null) {
             return false;
-        if (propertyTypes != null ? !propertyTypes.equals(that.propertyTypes) 
: that.propertyTypes != null)
+        }
+        if (propertyTypes != null ? !propertyTypes.equals(that.propertyTypes) 
: that.propertyTypes != null) {
             return false;
-        if (providerClassName != null ? 
!providerClassName.equals(that.providerClassName) : that.providerClassName != 
null)
+        }
+        if (providerClassName != null ? 
!providerClassName.equals(that.providerClassName) : that.providerClassName != 
null) {
             return false;
-        if (traversableResolverClass != null ? 
!traversableResolverClass.equals(that.traversableResolverClass) : 
that.traversableResolverClass != null)
+        }
+        if (traversableResolverClass != null ? 
!traversableResolverClass.equals(that.traversableResolverClass) : 
that.traversableResolverClass != null) {
             return false;
+        }
         return true;
     }