[Unicore-cvs-commits] SF.net SVN: unicore:[13485] distributed-storage/dcatalogue/trunk/src/main/ java/pl/edu/icm/dsms/catalogue/dao/DBDao.java

[<tre...@us...>]

Revision: 13485
          http://unicore.svn.sourceforge.net/unicore/?rev=13485&view=rev
Author:   trekawek
Date:     2012-05-27 11:48:55 +0000 (Sun, 27 May 2012)
Log Message:
-----------
dSMS id is generated if necessary

Modified Paths:
--------------
    distributed-storage/dcatalogue/trunk/src/main/java/pl/edu/icm/dsms/catalogue/dao/DBDao.java

Modified: distributed-storage/dcatalogue/trunk/src/main/java/pl/edu/icm/dsms/catalogue/dao/DBDao.java
===================================================================
--- distributed-storage/dcatalogue/trunk/src/main/java/pl/edu/icm/dsms/catalogue/dao/DBDao.java	2012-05-26 21:17:41 UTC (rev 13484)
+++ distributed-storage/dcatalogue/trunk/src/main/java/pl/edu/icm/dsms/catalogue/dao/DBDao.java	2012-05-27 11:48:55 UTC (rev 13485)
@@ -12,6 +12,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -102,10 +103,14 @@
 				DsmsMapper dMap = ses.getMapper(DsmsMapper.class);
 				FileMapper fMap = ses.getMapper(FileMapper.class);
 				
+				String id = uniqueId;
+				if(id == null || id.length() == 0) {
+					id = UUID.randomUUID().toString();
+				}
 				Dsms dsms = new Dsms(ownerDn);
-				dsms.setIdentifier(uniqueId);
+				dsms.setIdentifier(id);
 				dMap.insert(dsms);
-				dsms = dMap.getDsms(uniqueId); //to get DB id
+				dsms = dMap.getDsms(id); //to get DB id
 				
 				File f = new File("", true, ownerDn);
 				f.setFullPath("");
@@ -114,12 +119,12 @@
 				f.setParentId(0);
 				fMap.insert(f);
 				
-				fileLocks.put(uniqueId, new ReentrantReadWriteLock());
+				fileLocks.put(id, new ReentrantReadWriteLock());
 				ses.commit();
 				
-				dsmses.put(uniqueId, dMap.getDsms(uniqueId));
+				dsmses.put(id, dMap.getDsms(id));
 				
-				return uniqueId;
+				return id;
 			}
 			finally
 			{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.