[jbossws-commits] JBossWS SVN: r18078 - stack/cxf/branches/jbossws-cxf-4.2.3.Final/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.
Author: asoldano
Date: 2013-11-08 09:19:02 -0500 (Fri, 08 Nov 2013)
New Revision: 18078
Modified:
stack/cxf/branches/jbossws-cxf-4.2.3.Final/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
svn merge -r 18076:18077 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Modified:
stack/cxf/branches/jbossws-cxf-4.2.3.Final/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.2.3.Final/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-11-08
14:07:22 UTC (rev 18077)
+++
stack/cxf/branches/jbossws-cxf-4.2.3.Final/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-11-08
14:19:02 UTC (rev 18078)
@@ -161,7 +161,7 @@
bus.getInInterceptors().add(new NsCtxSelectorStoreInterceptor());
final String p = (props != null) ?
props.get(Constants.JBWS_CXF_DISABLE_HANDLER_AUTH_CHECKS) : null;
- if (p == null || (!"true".equalsIgnoreCase(p) &&
!"1".equalsIgnoreCase(p))) {
+ if ((p == null || (!"true".equalsIgnoreCase(p) &&
!"1".equalsIgnoreCase(p))) &&
!Boolean.getBoolean(Constants.JBWS_CXF_DISABLE_HANDLER_AUTH_CHECKS)) {
bus.getInInterceptors().add(new HandlerAuthInterceptor());
}
}