Skip to content
Snippets Groups Projects
Commit e6a9d52f authored by gmantele's avatar gmantele
Browse files

[UWS] Fix synchronization bug while generating the default Job ID

parent 0e249847
No related branches found
No related tags found
No related merge requests found
...@@ -22,9 +22,6 @@ package uws.job; ...@@ -22,9 +22,6 @@ package uws.job;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.FieldPosition;
import java.text.ParsePosition;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -122,7 +119,7 @@ import uws.service.log.UWSLog.LogLevel; ...@@ -122,7 +119,7 @@ import uws.service.log.UWSLog.LogLevel;
* </ul> * </ul>
* *
* @author Gr&eacute;gory Mantelet (CDS;ARI) * @author Gr&eacute;gory Mantelet (CDS;ARI)
* @version 4.1 (08/2014) * @version 4.1 (10/2014)
*/ */
public class UWSJob extends SerializableUWSObject { public class UWSJob extends SerializableUWSObject {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -394,13 +391,15 @@ public class UWSJob extends SerializableUWSObject { ...@@ -394,13 +391,15 @@ public class UWSJob extends SerializableUWSObject {
* @return A unique job identifier. * @return A unique job identifier.
*/ */
protected String generateJobId(){ protected String generateJobId(){
String generatedId = System.currentTimeMillis() + "A"; synchronized(lastId){
if (lastId != null){ String generatedId = System.currentTimeMillis() + "A";
while(lastId.equals(generatedId)) if (lastId != null){
generatedId = generatedId.substring(0, generatedId.length() - 1) + (char)(generatedId.charAt(generatedId.length() - 1) + 1); while(lastId.equals(generatedId))
generatedId = generatedId.substring(0, generatedId.length() - 1) + (char)(generatedId.charAt(generatedId.length() - 1) + 1);
}
lastId = generatedId;
return generatedId;
} }
lastId = generatedId;
return generatedId;
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment