Author: ffang
Date: Tue Feb 7 03:56:18 2012
New Revision: 1241343
URL: http://svn.apache.org/viewvc?rev=1241343&view=rev
Log:
Merged revisions 1241339 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1241339 | ffang | 2012-02-07 11:12:17 +0800 (二, 07 2 2012) | 1 line
[CXF-4085]revert to use System.getProperty as
SystemPropertyAction.getProperty isn't applicable on this branch
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1241343&r1=1241342&r2=1241343&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Tue Feb 7 03:56:18 2012
@@ -51,7 +51,6 @@ 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;
@@ -471,7 +470,7 @@ public class EndpointImpl extends javax.
SecurityManager sm = System.getSecurityManager();
boolean checkPublishEndpointPermissionWithSecurityManager
= Boolean.valueOf(
- SystemPropertyAction.getProperty(
+ System.getProperty(
CHECK_PUBLISH_ENDPOINT_PERMISSON_PROPERTY_WITH_SECURITY_MANAGER,
"true"));
if (checkPublishEndpointPermissionWithSecurityManager && sm != null) {
