Merge branch 'fix/STOR-459' into develop

italiangrid · Dec 18, 2013 · f2b5cc4 · f2b5cc4
2 parents f135bc6 + 97f4640
commit f2b5cc4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/it/grid/storm/catalogs/BoLChunkDAO.java b/src/main/java/it/grid/storm/catalogs/BoLChunkDAO.java
@@ -1750,8 +1750,7 @@ private synchronized Collection<BoLChunkDataTO> find(int[] surlsUniqueIDs,
 				chunkDataTO.setDirOption(rs.getBoolean("d.isSourceADirectory"));
 				chunkDataTO.setAllLevelRecursive(rs.getBoolean("d.allLevelRecursive"));
 				chunkDataTO.setNumLevel(rs.getInt("d.numOfLevels"));
-				chunkDataTO.setProtocolList(PtPChunkDAO.getInstance().findProtocols(
-					rs.getLong("rq.ID")));
+
 				list.add(chunkDataTO);
 			}
 			return list;

diff --git a/src/main/java/it/grid/storm/catalogs/PtGChunkDAO.java b/src/main/java/it/grid/storm/catalogs/PtGChunkDAO.java
@@ -1835,8 +1835,7 @@ private synchronized Collection<PtGChunkDataTO> find(int[] surlsUniqueIDs,
 				chunkDataTO.setDirOption(rs.getBoolean("d.isSourceADirectory"));
 				chunkDataTO.setAllLevelRecursive(rs.getBoolean("d.allLevelRecursive"));
 				chunkDataTO.setNumLevel(rs.getInt("d.numOfLevels"));
-				chunkDataTO.setProtocolList(PtPChunkDAO.getInstance().findProtocols(
-					rs.getLong("rq.ID")));
+
 				list.add(chunkDataTO);
 			}
 			return list;

diff --git a/src/main/java/it/grid/storm/catalogs/PtPChunkDAO.java b/src/main/java/it/grid/storm/catalogs/PtPChunkDAO.java
@@ -1297,8 +1297,7 @@ private synchronized Collection<PtPChunkDataTO> find(int[] surlsUniqueIDs,
 					chunkDataTO.setSurlUniqueID(new Integer(uniqueID));
 				}
 
-				chunkDataTO.setExpectedFileSize(rs.getLong("rp.expectedFileSize"));
-				chunkDataTO.setProtocolList(findProtocols(rs.getLong("rq.ID")));
+				chunkDataTO.setExpectedFileSize(rs.getLong("rp.expectedFileSize"));				
 				chunkDataTO.setRequestToken(rs.getString("rq.r_token"));
 				chunkDataTO.setStatus(rs.getInt("sp.statusCode"));
 				list.add(chunkDataTO);