diff --git a/exo.jcr.component.core/pom.xml b/exo.jcr.component.core/pom.xml
index 164686e02..2fb63dee9 100644
--- a/exo.jcr.component.core/pom.xml
+++ b/exo.jcr.component.core/pom.xml
@@ -157,6 +157,10 @@
                <groupId>org.apache.tika</groupId>
                <artifactId>tika-core</artifactId>
             </exclusion>
+            <exclusion>
+               <groupId>org.apache.cxf</groupId>
+               <artifactId>cxf-rt-rs-client</artifactId>
+            </exclusion>
             <exclusion>
                <groupId>org.apache.geronimo.specs</groupId>
                <artifactId>geronimo-stax-api_1.0_spec</artifactId>
diff --git a/exo.jcr.ext.services/src/main/java/org/exoplatform/services/jcr/ext/ActivityTypeUtils.java b/exo.jcr.ext.services/src/main/java/org/exoplatform/services/jcr/ext/ActivityTypeUtils.java
index 97ed2aafa..3338d36f2 100644
--- a/exo.jcr.ext.services/src/main/java/org/exoplatform/services/jcr/ext/ActivityTypeUtils.java
+++ b/exo.jcr.ext.services/src/main/java/org/exoplatform/services/jcr/ext/ActivityTypeUtils.java
@@ -55,7 +55,7 @@ public static void attachActivityId(Node ownerNode, String activityId) {
       if (!ownerNode.isCheckedOut()) {
         verNode = checkout(ownerNode);
       }
-      if (ownerNode.isNodeType(EXO_ACTIVITY_INFO) == false && ownerNode.canAddMixin(EXO_ACTIVITY_INFO)) {
+      if (!ownerNode.isNodeType(EXO_ACTIVITY_INFO) && ownerNode.canAddMixin(EXO_ACTIVITY_INFO)) {
         ownerNode.addMixin(EXO_ACTIVITY_INFO);
       }
       ownerNode.setProperty(EXO_ACTIVITY_ID, activityId);