[jbossws-commits] JBossWS SVN: r18798 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test.

[jbossws-commits at lists.jboss.org]

Author: asoldano
Date: 2014-07-11 11:19:43 -0400 (Fri, 11 Jul 2014)
New Revision: 18798

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java
Log:
Avoid runtime dependency on CXF internal API, as that can mask errors with NCDFE


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java	2014-07-11 15:18:35 UTC (rev 18797)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/CryptoHelper.java	2014-07-11 15:19:43 UTC (rev 18798)
@@ -23,8 +23,6 @@
 
 import java.security.NoSuchAlgorithmException;
 
-import org.apache.cxf.binding.soap.SoapFault;
-
 public final class CryptoHelper
 {
    public static Exception checkAndWrapException(Exception e) throws Exception {
@@ -34,7 +32,7 @@
       } else if(!isUnlimitedStrengthCryptographyAvailable()) {
          return new Exception("JCE unlimited strength cryptography extension does not seem to be properly installed; either install it " +
                "or run the testuite with '-Dexclude-integration-tests-unlimited-strength-related=true' to exclude this test.", e);
-      } else if (e.getCause() != null && e.getCause() instanceof SoapFault && e.getMessage() != null && e.getMessage().contains("algorithm")) {
+      } else if (e.getCause() != null && e.getCause().getClass().getName().contains("SoapFault") && e.getMessage() != null && e.getMessage().contains("algorithm")) {
          return new Exception("Please check for Bouncy Castle JCE provider and JCE unlimited strenght cryptography extension availability on server side.", e);
       } else {
          return e;