ARQ-1658 Wrong isInstance check prevents usage of custom container

arquillian · Feb 25, 2014 · 5a51e61 · 5a51e61
1 parent f96c6e7
commit 5a51e61
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...containers/src/main/java/org/arquillian/droidium/multiplecontainers/ContainerGuesser.java b/...containers/src/main/java/org/arquillian/droidium/multiplecontainers/ContainerGuesser.java
@@ -151,7 +151,7 @@ public static boolean hasAdapterImplClassProperty(ContainerDef containerDef) {
     }
 
     public static String getAdapterImplClassValue(ContainerDef containerDef) {
-        return containerDef.getContainerProperties().get(ADAPTER_IMPL_CONFIG_STRING);
+        return containerDef.getContainerProperties().get(ADAPTER_IMPL_CONFIG_STRING).trim();
     }
 
 }
diff --git a/...ain/java/org/arquillian/droidium/multiplecontainers/MultipleContainerRegistryCreator.java b/...ain/java/org/arquillian/droidium/multiplecontainers/MultipleContainerRegistryCreator.java
@@ -138,8 +138,8 @@ private boolean isCreatingContainer(ContainerDef containerDef, Collection<Deploy
         // and we check that the class is an instance of DeployableContainer
         if (ContainerGuesser.hasAdapterImplClassProperty(containerDef)) {
             if (SecurityActions.isClassPresent(ContainerGuesser.getAdapterImplClassValue(containerDef))) {
-                return SecurityActions.loadClass(ContainerGuesser.getAdapterImplClassValue(containerDef)).isInstance(
-                    DeployableContainer.class);
+                return DeployableContainer.class.isAssignableFrom(
+                    SecurityActions.loadClass(ContainerGuesser.getAdapterImplClassValue(containerDef)));
             }
         }
 
@@ -150,10 +150,10 @@ private boolean isCreatingContainer(ContainerDef containerDef, Collection<Deploy
             + "It is expected that when you name your container like that, you put Arquillian container adapter for that "
             + "container on classpath in order to start it afterwards.",
             new Object[] {
-                    containerDef.getContainerName(),
-                    ContainerGuesser.ADAPTER_IMPL_CONFIG_STRING,
-                    ContainerType.getAll()
-                });
+                containerDef.getContainerName(),
+                ContainerGuesser.ADAPTER_IMPL_CONFIG_STRING,
+                ContainerType.getAll()
+            });
 
         return false;
     }