You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by co...@apache.org on 2009/04/15 11:51:53 UTC
svn commit: r765101 - in /webservices/wss4j/trunk/src/org/apache/ws:
axis/security/WSDoAllSender.java security/WSSConfig.java
security/util/UUIDGenerator.java
Author: coheigea
Date: Wed Apr 15 09:51:53 2009
New Revision: 765101
URL: http://svn.apache.org/viewvc?rev=765101&view=rev
Log:
Forward merged Dan's fixes to the UUIDGenerator to trunk
- Removed static WSSConfig from WSDoALLSender as a result.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java
webservices/wss4j/trunk/src/org/apache/ws/security/util/UUIDGenerator.java
Modified: webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java?rev=765101&r1=765100&r2=765101&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java Wed Apr 15 09:51:53 2009
@@ -25,7 +25,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ws.axis.security.handler.WSDoAllHandler;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
@@ -45,7 +44,6 @@
protected static Log log = LogFactory.getLog(WSDoAllSender.class.getName());
private static Log tlog =
LogFactory.getLog("org.apache.ws.security.TIME");
- private static WSSConfig wssConfig = WSSConfig.getNewInstance();
/**
* Axis calls invoke to handle a message. <p/>
@@ -69,7 +67,6 @@
}
RequestData reqData = new RequestData();
- reqData.setWssConfig(wssConfig);
reqData.setMsgContext(mc);
/*
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java?rev=765101&r1=765100&r2=765101&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java Wed Apr 15 09:51:53 2009
@@ -196,7 +196,12 @@
*/
protected boolean handleCustomPasswordTypes = false;
- protected WsuIdAllocator idAllocator = new WsuIdAllocator() {
+
+ /**
+ * The default wsu:Id allocator is a simple "start at 1 and increment up"
+ * thing that is very fast.
+ */
+ public static WsuIdAllocator DEFAULT_ID_ALLOCATOR = new WsuIdAllocator() {
int i;
private synchronized String next() {
return Integer.toString(++i);
@@ -215,7 +220,8 @@
return prefix + UUIDGenerator.getUUID();
}
};
-
+ protected WsuIdAllocator idAllocator = DEFAULT_ID_ALLOCATOR;
+
protected HashMap jceProvider = new HashMap(10);
/**
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/util/UUIDGenerator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/UUIDGenerator.java?rev=765101&r1=765100&r2=765101&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/UUIDGenerator.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/UUIDGenerator.java Wed Apr 15 09:51:53 2009
@@ -46,7 +46,7 @@
*/
public static String getUUID() {
if (baseUUID == null) {
- baseUUID = getInitialUUID();
+ getInitialUUID();
}
long i = ++incrementingValue;
if(i >= Long.MAX_VALUE || i < 0){
@@ -56,7 +56,10 @@
return baseUUID + System.currentTimeMillis() + i;
}
- protected static String getInitialUUID() {
+ protected static synchronized void getInitialUUID() {
+ if (baseUUID != null) {
+ return;
+ }
if (myRand == null) {
myRand = new Random();
}
@@ -90,7 +93,7 @@
int begin = myRand.nextInt();
if (begin < 0) begin = begin * -1;
begin = begin % 8;
- return sb2.toString().substring(begin, begin + 18).toUpperCase();
+ baseUUID = sb2.toString().substring(begin, begin + 18).toUpperCase();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org