You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ws.apache.org by co...@apache.org on 2010/11/15 18:10:56 UTC
svn commit: r1035356 - in
/webservices/wss4j/trunk/src/org/apache/ws/security:
message/token/Timestamp.java message/token/UsernameToken.java
util/XmlSchemaDateFormat.java
Author: coheigea
Date: Mon Nov 15 17:10:56 2010
New Revision: 1035356
URL: http://svn.apache.org/viewvc?rev=1035356&view=rev
Log:
Some optimisations to Timestamp code.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java
webservices/wss4j/trunk/src/org/apache/ws/security/util/XmlSchemaDateFormat.java
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java?rev=1035356&r1=1035355&r2=1035356&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java Mon Nov 15 17:10:56 2010
@@ -34,7 +34,6 @@ import org.w3c.dom.Text;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.text.DateFormat;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
@@ -103,7 +102,7 @@ public class Timestamp {
DateFormat zulu = new XmlSchemaDateFormat();
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("Current time: " + zulu.format(Calendar.getInstance().getTime()));
+ LOG.debug("Current time: " + zulu.format(new Date()));
}
if (strCreated != null) {
createdDate = zulu.parse(strCreated);
@@ -147,20 +146,16 @@ public class Timestamp {
zulu = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
zulu.setTimeZone(TimeZone.getTimeZone("UTC"));
}
- Calendar calendar = getCurrentTime();
-
Element elementCreated =
doc.createElementNS(
WSConstants.WSU_NS, WSConstants.WSU_PREFIX + ":" + WSConstants.CREATED_LN
);
- createdDate = calendar.getTime();
+ createdDate = new Date();
elementCreated.appendChild(doc.createTextNode(zulu.format(createdDate)));
element.appendChild(elementCreated);
if (ttl != 0) {
- long currentTime = calendar.getTimeInMillis();
- currentTime += ttl * 1000;
- calendar.setTimeInMillis(currentTime);
- expiresDate = calendar.getTime();
+ expiresDate = new Date();
+ expiresDate.setTime(createdDate.getTime() + (ttl * 1000));
Element elementExpires =
doc.createElementNS(
@@ -180,15 +175,6 @@ public class Timestamp {
}
/**
- * Get the current time
- *
- * @return calendar the current time
- */
- protected Calendar getCurrentTime() {
- return Calendar.getInstance();
- }
-
- /**
* Returns the dom element of this <code>Timestamp</code> object.
*
* @return the <code>wsse:UsernameToken</code> element
@@ -262,8 +248,8 @@ public class Timestamp {
*/
public boolean isExpired() {
if (expiresDate != null) {
- Calendar rightNow = Calendar.getInstance();
- return expiresDate.before(rightNow.getTime());
+ Date rightNow = new Date();
+ return expiresDate.before(rightNow);
}
return false;
}
@@ -281,13 +267,12 @@ public class Timestamp {
int timeToLive
) {
// Calculate the time that is allowed for the message to travel
- Calendar validCreation = Calendar.getInstance();
- long currentTime = validCreation.getTime().getTime();
- currentTime -= timeToLive * 1000;
- validCreation.setTime(new Date(currentTime));
+ Date validCreation = new Date();
+ long currentTime = validCreation.getTime() - timeToLive * 1000;
+ validCreation.setTime(currentTime);
// Validate the time it took the message to travel
- if (createdDate != null && createdDate.before(validCreation.getTime())) {
+ if (createdDate != null && createdDate.before(validCreation)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Validation of Timestamp: The message was created too long ago");
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java?rev=1035356&r1=1035355&r2=1035356&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/token/UsernameToken.java Mon Nov 15 17:10:56 2010
@@ -41,8 +41,8 @@ import java.security.NoSuchAlgorithmExce
import java.security.Principal;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.text.DateFormat;
-import java.util.Calendar;
import java.util.TimeZone;
/**
@@ -294,12 +294,12 @@ public class UsernameToken {
zulu = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
zulu.setTimeZone(TimeZone.getTimeZone("UTC"));
}
- Calendar rightNow = Calendar.getInstance();
elementCreated =
doc.createElementNS(
WSConstants.WSU_NS, WSConstants.WSU_PREFIX + ":" + WSConstants.CREATED_LN
);
- elementCreated.appendChild(doc.createTextNode(zulu.format(rightNow.getTime())));
+ Date currentTime = new Date();
+ elementCreated.appendChild(doc.createTextNode(zulu.format(currentTime)));
element.appendChild(elementCreated);
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/util/XmlSchemaDateFormat.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/XmlSchemaDateFormat.java?rev=1035356&r1=1035355&r2=1035356&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/XmlSchemaDateFormat.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/XmlSchemaDateFormat.java Mon Nov 15 17:10:56 2010
@@ -45,10 +45,6 @@ public class XmlSchemaDateFormat extends
private static Log log = LogFactory.getLog(XmlSchemaDateFormat.class);
/**
- * Message retriever.
- */
- // private static final MessageRetriever MSG = ResourceKeys.MSG;
- /**
* DateFormat for Zulu (UTC) form of an XML Schema dateTime string.
*/
private static final DateFormat DATEFORMAT_XSD_ZULU = new SimpleDateFormat(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ws.apache.org
For additional commands, e-mail: dev-help@ws.apache.org