Author: ffang Date: Mon Feb 6 03:38:35 2012 New Revision: 1240885 URL: http://svn.apache.org/viewvc?rev=1240885&view=rev Log: Merged revisions 1240882 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1240882 | ffang | 2012-02-06 10:45:47 +0800 (一, 06 2 2012) | 9 lines Merged revisions 1240879 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1240879 | ffang | 2012-02-06 10:22:21 +0800 (一, 06 2 2012) | 1 line [CXF-4085]use SystemPropertyAction.getProperty but not System.getProperty ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1240885&r1=1240884&r2=1240885&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Mon Feb 6 03:38:35 2012 @@ -51,6 +51,7 @@ import org.apache.cxf.binding.BindingCon import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.common.util.ClassHelper; import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList; +import org.apache.cxf.common.util.SystemPropertyAction; import org.apache.cxf.configuration.Configurable; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.databinding.DataBinding; @@ -490,7 +491,7 @@ public class EndpointImpl extends javax. SecurityManager sm = System.getSecurityManager(); boolean checkPublishEndpointPermissionWithSecurityManager = Boolean.valueOf( - System.getProperty( + SystemPropertyAction.getProperty( CHECK_PUBLISH_ENDPOINT_PERMISSON_PROPERTY_WITH_SECURITY_MANAGER, "true")); if (checkPublishEndpointPermissionWithSecurityManager && sm != null) {
