Improve application deployment exception checking.

OpenLiberty · Apr 23, 2018 · d6a99b1 · d6a99b1
1 parent be77eec
commit d6a99b1
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/...src/main/java/org/jboss/arquillian/container/was/wlp_managed_8_5/WLPManagedContainer.java b/...src/main/java/org/jboss/arquillian/container/was/wlp_managed_8_5/WLPManagedContainer.java
@@ -1098,18 +1098,31 @@ private void throwWrappedExceptionIfFoundInLog(String applicationName) throws IO
          br = new BufferedReader(new InputStreamReader(new FileInputStream(messagesFilePath)));
          String line;
          while ((line = br.readLine()) != null) {
-            if (line.contains("CWWKZ0002") && line.contains("DefinitionException") && line.contains(applicationName)) {
-               log.finest("DefinitionException found in line" + line + " of file " + messagesFilePath);
-               DefinitionException cause = new javax.enterprise.inject.spi.DefinitionException(line);
-               throw new DeploymentException(
-                     "Failed to deploy " + applicationName + " on " + containerConfiguration.getServerName(), cause);
-            } else {
-               if (line.contains("DeploymentException") && line.contains(applicationName)) {
-                  log.finest("DeploymentException found in line" + line + " of file " + messagesFilePath);
-                  javax.enterprise.inject.spi.DeploymentException cause = new javax.enterprise.inject.spi.DeploymentException(
-                        line);
+            if (line.contains("CWWKZ0002") && line.contains(applicationName)) {
+               if (line.contains("DefinitionException")) {
+                  log.finest("DefinitionException found in line" + line + " of file " + messagesFilePath);
+                  DefinitionException cause = new javax.enterprise.inject.spi.DefinitionException(line);
                   throw new DeploymentException(
                         "Failed to deploy " + applicationName + " on " + containerConfiguration.getServerName(), cause);
+               } else if (line.contains("DeploymentException") ||
+                          line.contains("InconsistentSpecializationException") ||
+                          line.contains("UnserializableDependencyException")) {
+                  /*
+                   * The CDI specification allows an implementation to throw a subclass of
+                   * javax.enterprise.inject.spi.DeploymentException. Weld has three types
+                   * such exceptions:
+                   *  - org.jboss.weld.exceptions.DeploymentException
+                   *  - org.jboss.weld.exceptions.InconsistentSpecializationException
+                   *  - org.jboss.weld.exceptions.UnserializableDependencyException
+                   */
+                  log.finest("DeploymentException found in line" + line + " of file " + messagesFilePath);
+                  javax.enterprise.inject.spi.DeploymentException cause = new javax.enterprise.inject.spi.DeploymentException(line);
+                  throw new DeploymentException("Failed to deploy " + applicationName + " on " + containerConfiguration.getServerName(), cause);
+               } else {
+                  /*
+                   * Application failed to deploy for some other reason.
+                   */
+                  throw new DeploymentException("Failed to deploy " + applicationName + " on " + containerConfiguration.getServerName());
                }
             }
          }