fixed a bug

modules/ideaService/ideaService-service/src/main/java/ideaService/service/avconversion/VideoConverter.java

@@ -121,14 +121,6 @@ public class VideoConverter extends BaseBackgroundTaskExecutor {
 
         logger.info("CREATED ENTRY: " + fileUrl);
         VideosLocalServiceUtil.createNewVideoEntry(i.getPrimaryKey(), createdEntry.getPrimaryKey(), fileUrl, convertTo);
-//        String newIdeasVideoUrlEntry;
-//        if(i.getVideoUrl() != null && !i.getVideoUrl().equals("")){
-//        	newIdeasVideoUrlEntry = i.getVideoUrl() + "," + fileUrl;
-//        }else{
-//        	newIdeasVideoUrlEntry = fileUrl;
-//        }
-//        i.setVideoUrl(newIdeasVideoUrlEntry);
-//        i.persist();
 
         logger.info("-------------------------------- Deleting temp files -----------------------------------");
         tmpSourceFile.delete();

modules/ideaService/ideaService-service/src/main/java/ideaService/service/impl/IdeasLocalServiceImpl.java

@@ -162,10 +162,6 @@ public class IdeasLocalServiceImpl extends IdeasLocalServiceBaseImpl {
 	public void addVideoToExistingIdea(long ideasId, long videoId, String videoRef, ThemeDisplay themedisplay){
 		try {
 			Ideas i = IdeasUtil.findByPrimaryKey(ideasId);
-//			i.setVideoFileRef(videoId);
-//			//i.setVideoUrl(videoRef);
-//			i.persist();
-
 			VideosLocalServiceUtil.createNewVideoEntry(ideasId, videoId, videoRef, VideoExtensions.ORIGINAL.getVideoExtensionDescription());
 
 			startBackgroundVideoConversion(i,VideoExtensions.WEBM.getVideoExtensionDescription(), themedisplay);

modules/ideaService/ideaService-service/src/main/java/ideaService/service/impl/VideosLocalServiceImpl.java

@@ -51,18 +51,21 @@ public class VideosLocalServiceImpl extends VideosLocalServiceBaseImpl {
 
 		try {
 			Videos v = this.getVideoUrlByIdeaRefAndExtension(ideasRef,extension);
-			DLAppLocalServiceUtil.deleteFileEntry(v.getFileRef());
-			VideosUtil.remove(v.getPrimaryKey());
+			if(v != null){
+				DLAppLocalServiceUtil.deleteFileEntry(v.getFileRef());
+				VideosUtil.remove(v.getPrimaryKey());
+			}
 	} catch (PortalException e) {
+		e.printStackTrace();
 	}
 		int nextDbId = (int)CounterLocalServiceUtil.increment(Videos.class.getName());
-		Videos nextPic = VideosLocalServiceUtil.createVideos(nextDbId);
-		nextPic.setIdeasRef(ideasRef);
-		nextPic.setExtension(extension);
-		nextPic.setFileRef(fileRef);
-		nextPic.setVideoUrl(videoUrl);
-		nextPic.persist();
-		return nextPic.getPrimaryKey();
+		Videos nextVideo = VideosLocalServiceUtil.createVideos(nextDbId);
+		nextVideo.setIdeasRef(ideasRef);
+		nextVideo.setExtension(extension);
+		nextVideo.setFileRef(fileRef);
+		nextVideo.setVideoUrl(videoUrl);
+		nextVideo.persist();
+		return nextVideo.getPrimaryKey();
 	}
 
 	public List<Videos> getAllVideosForIdeasRef(long ideasRef) throws NoSuchVideosException{