Author: cschneider
Date: Wed Jun 8 07:13:37 2011
New Revision: 1133263
URL: http://svn.apache.org/viewvc?rev=1133263&view=rev
Log:
CXF-3576 Patch applied with thanks to Oliver Wulff
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1133263&r1=1133262&r2=1133263&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Wed Jun 8 07:13:37 2011
@@ -906,7 +906,7 @@ public class STSClient implements Config
private void addLifetime(XMLStreamWriter writer) throws XMLStreamException
{
Date creationTime = new Date();
Date expirationTime = new Date();
- expirationTime.setTime(creationTime.getTime() + (ttl * 1000));
+ expirationTime.setTime(creationTime.getTime() + (ttl * 1000L));
XmlSchemaDateFormat fmt = new XmlSchemaDateFormat();
writer.writeStartElement("wst", "Lifetime", namespace);
@@ -1130,7 +1130,7 @@ public class STSClient implements Config
properties.load(ins);
ins.close();
} else {
- throw new Fault("Could not find properties file " + url, LOG);
+ throw new Fault("Could not find properties file " + (String)o,
LOG);
}
} else if (o instanceof URL) {
properties = new Properties();