svn commit: r1133402 - in /cxf/branches/2.3.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java

[dkulp]

Author: dkulp
Date: Wed Jun  8 13:53:30 2011
New Revision: 1133402

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

........
  r1133263 | cschneider | 2011-06-08 03:13:37 -0400 (Wed, 08 Jun 2011) | 1 line
  
  CXF-3576 Patch applied with thanks to Oliver Wulff
........

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

Propchange: cxf/branches/2.3.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: 
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1133402&r1=1133401&r2=1133402&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
 Wed Jun  8 13:53:30 2011
@@ -838,7 +838,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);
@@ -1059,7 +1059,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();