You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/09/22 03:02:09 UTC
svn commit: r999705 - in
/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket:
protocol/http/MockHttpSession.java util/upload/DiskFileItem.java
Author: ivaynberg
Date: Wed Sep 22 01:02:08 2010
New Revision: 999705
URL: http://svn.apache.org/viewvc?rev=999705&view=rev
Log:
Issue: WICKET-3069
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java?rev=999705&r1=999704&r2=999705&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpSession.java Wed Sep 22 01:02:08 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.protocol.http;
import java.io.Serializable;
-import java.rmi.server.UID;
import java.util.Collections;
import java.util.Enumeration;
@@ -42,7 +41,7 @@ public class MockHttpSession implements
private final long creationTime = System.currentTimeMillis();
- private final String id = (new UID()).toString().replace(':', '_').replace('-', '_');
+ private final String id = java.util.UUID.randomUUID().toString().replace('-', '_');
private long lastAccessedTime = 0;
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java?rev=999705&r1=999704&r2=999705&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java Wed Sep 22 01:02:08 2010
@@ -90,11 +90,9 @@ public class DiskFileItem implements Fil
/**
- * UID used in unique file name generation.
+ * UUID used in unique file name generation.
*/
- private static final String UID = new java.rmi.server.UID().toString()
- .replace(':', '_')
- .replace('-', '_');
+ private static final String UID = java.util.UUID.randomUUID().toString().replace('-', '_');
/**
* Random counter used in unique identifier generation.