cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r835579 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Date Thu, 12 Nov 2009 22:02:26 GMT
Author: dkulp
Date: Thu Nov 12 22:02:26 2009
New Revision: 835579

URL: http://svn.apache.org/viewvc?rev=835579&view=rev
Log:
Merged revisions 835575 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r835575 | dkulp | 2009-11-12 16:59:50 -0500 (Thu, 12 Nov 2009) | 1 line
  
  Add a null check for the policy
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java?rev=835579&r1=835578&r2=835579&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Thu Nov 12 22:02:26 2009
@@ -106,7 +106,9 @@
         ei.setName(epName == null ? iName : epName);
         ei.setAddress(location);
         si.addEndpoint(ei);
-        ei.addExtensor(policy);
+        if (policy != null) {
+            ei.addExtensor(policy);
+        }
         
         BindingOperationInfo boi = bi.getOperation(ioi);
         SoapOperationInfo soi = boi.getExtensor(SoapOperationInfo.class);



Mime
View raw message