Author: dkulp
Date: Thu Nov 5 23:27:21 2009
New Revision: 833237
URL: http://svn.apache.org/viewvc?rev=833237&view=rev
Log:
Merged revisions 833231 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r833231 | dkulp | 2009-11-05 18:13:40 -0500 (Thu, 05 Nov 2009) | 1 line
[CXF-2524] Allow null lifetime element
........
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/tokenstore/SecurityToken.java
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
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/tokenstore/SecurityToken.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java?rev=833237&r1=833236&r2=833237&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
Thu Nov 5 23:27:21 2009
@@ -157,7 +157,9 @@
Element lifetimeElem) {
this.id = id;
this.token = cloneElement(tokenElem);
- this.processLifeTime(lifetimeElem);
+ if (lifetimeElem !=null) {
+ processLifeTime(lifetimeElem);
+ }
}
private static Element cloneElement(Element el) {
try {
